diff options
author | Pacien TRAN-GIRARD | 2017-07-01 23:18:40 +0200 |
---|---|---|
committer | Pacien TRAN-GIRARD | 2017-07-01 23:18:40 +0200 |
commit | d221543bb9d6bc9b7344cc96f010a501ff35bb7f (patch) | |
tree | b86dc361ac279615ded4cbf902743d90559a39db /app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt | |
parent | 3e3135b0c7fba811735a30e7fd155ca1e188c787 (diff) | |
download | tincapp-d221543bb9d6bc9b7344cc96f010a501ff35bb7f.tar.gz |
Support config located on external storage with the "external/" prefix
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt index 3807ddc..910b36f 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt | |||
@@ -57,19 +57,18 @@ class StartActivity : BaseActivity() { | |||
57 | } | 57 | } |
58 | 58 | ||
59 | fun confDirDialog(@Suppress("UNUSED_PARAMETER") v: View) { | 59 | fun confDirDialog(@Suppress("UNUSED_PARAMETER") v: View) { |
60 | val confDir = AppPaths.confDir().path | ||
61 | |||
62 | AlertDialog.Builder(this) | 60 | AlertDialog.Builder(this) |
63 | .setTitle(R.string.title_tinc_config_dir) | 61 | .setTitle(R.string.title_tinc_config_dir) |
64 | .setMessage(confDir) | 62 | .setMessage("Internal: " + AppPaths.confDir(AppPaths.Storage.INTERNAL) + "\n\n" + |
65 | .setNegativeButton(R.string.action_copy) { _, _ -> copyIntoClipboard(resources.getString(R.string.title_tinc_config_dir), confDir) } | 63 | "External: " + AppPaths.confDir(AppPaths.Storage.EXTERNAL)) |
66 | .setPositiveButton(R.string.action_close) { _, _ -> /* nop */ } | 64 | .setPositiveButton(R.string.action_close) { _, _ -> /* nop */ } |
67 | .show() | 65 | .show() |
68 | } | 66 | } |
69 | 67 | ||
70 | private fun startVpn(netName: String) { | 68 | private fun startVpn(netName: String) { |
71 | startService(Intent(this, TincVpnService::class.java) | 69 | startService(Intent(this, TincVpnService::class.java).putExtra(TincVpnService.INTENT_EXTRA_NET_CONF, |
72 | .putExtra(TincVpnService.INTENT_EXTRA_NET_NAME, netName)) | 70 | if (netName.startsWith("external/")) AppPaths.NetConf(AppPaths.Storage.EXTERNAL, netName.substringAfter("/")) |
71 | else AppPaths.NetConf(AppPaths.Storage.INTERNAL, netName))) | ||
73 | } | 72 | } |
74 | 73 | ||
75 | } | 74 | } |