diff options
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt | 6 | ||||
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt | 9 |
2 files changed, 5 insertions, 10 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt index 69408d8..3590f99 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt | |||
@@ -20,9 +20,9 @@ class ConfigureActivity : BaseActivity() { | |||
20 | } | 20 | } |
21 | 21 | ||
22 | private fun writeContent() { | 22 | private fun writeContent() { |
23 | text_configuration_directories.text = AppPaths.Storage.values().map { AppPaths.confDir(it) }.joinToString("\n") | 23 | text_configuration_directory.text = AppPaths.confDir().absolutePath |
24 | text_log_directories.text = AppPaths.Storage.values().map { AppPaths.cacheDir(it) }.joinToString("\n") | 24 | text_log_directory.text = AppPaths.cacheDir().absolutePath |
25 | text_tinc_binaries.text = listOf(AppPaths.tinc(), AppPaths.tincd()).joinToString("\n") | 25 | text_tinc_binary.text = AppPaths.tinc().absolutePath |
26 | } | 26 | } |
27 | 27 | ||
28 | fun generateConf(@Suppress("UNUSED_PARAMETER") v: View) = notify("Not implemented yet") | 28 | fun generateConf(@Suppress("UNUSED_PARAMETER") v: View) = notify("Not implemented yet") |
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 709989b..1c4b5a1 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt | |||
@@ -13,9 +13,7 @@ import android.view.ViewGroup | |||
13 | import android.widget.EditText | 13 | import android.widget.EditText |
14 | import android.widget.FrameLayout | 14 | import android.widget.FrameLayout |
15 | import kotlinx.android.synthetic.main.base.* | 15 | import kotlinx.android.synthetic.main.base.* |
16 | |||
17 | import org.pacien.tincapp.R | 16 | import org.pacien.tincapp.R |
18 | import org.pacien.tincapp.context.AppPaths | ||
19 | import org.pacien.tincapp.service.TincVpnService | 17 | import org.pacien.tincapp.service.TincVpnService |
20 | 18 | ||
21 | /** | 19 | /** |
@@ -65,10 +63,7 @@ class StartActivity : BaseActivity() { | |||
65 | 63 | ||
66 | fun openConfigureActivity(@Suppress("UNUSED_PARAMETER") i: MenuItem) = startActivity(Intent(this, ConfigureActivity::class.java)) | 64 | fun openConfigureActivity(@Suppress("UNUSED_PARAMETER") i: MenuItem) = startActivity(Intent(this, ConfigureActivity::class.java)) |
67 | 65 | ||
68 | private fun startVpn(netName: String) { | 66 | private fun startVpn(netName: String) = |
69 | startService(Intent(this, TincVpnService::class.java).putExtra(TincVpnService.INTENT_EXTRA_NET_CONF, | 67 | startService(Intent(this, TincVpnService::class.java).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))) | ||
72 | } | ||
73 | 68 | ||
74 | } | 69 | } |