diff options
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 | 18 |
1 files changed, 9 insertions, 9 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 910b36f..709989b 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt | |||
@@ -6,6 +6,8 @@ import android.content.Intent | |||
6 | import android.net.VpnService | 6 | import android.net.VpnService |
7 | import android.os.Bundle | 7 | import android.os.Bundle |
8 | import android.support.v7.app.AlertDialog | 8 | import android.support.v7.app.AlertDialog |
9 | import android.view.Menu | ||
10 | import android.view.MenuItem | ||
9 | import android.view.View | 11 | import android.view.View |
10 | import android.view.ViewGroup | 12 | import android.view.ViewGroup |
11 | import android.widget.EditText | 13 | import android.widget.EditText |
@@ -26,6 +28,11 @@ class StartActivity : BaseActivity() { | |||
26 | layoutInflater.inflate(R.layout.page_start, main_content) | 28 | layoutInflater.inflate(R.layout.page_start, main_content) |
27 | } | 29 | } |
28 | 30 | ||
31 | override fun onCreateOptionsMenu(m: Menu): Boolean { | ||
32 | menuInflater.inflate(R.menu.menu_start, m) | ||
33 | return super.onCreateOptionsMenu(m) | ||
34 | } | ||
35 | |||
29 | override fun onActivityResult(request: Int, result: Int, data: Intent?) { | 36 | override fun onActivityResult(request: Int, result: Int, data: Intent?) { |
30 | notify(if (result == Activity.RESULT_OK) R.string.message_vpn_permissions_granted else R.string.message_vpn_permissions_denied) | 37 | notify(if (result == Activity.RESULT_OK) R.string.message_vpn_permissions_granted else R.string.message_vpn_permissions_denied) |
31 | } | 38 | } |
@@ -45,7 +52,7 @@ class StartActivity : BaseActivity() { | |||
45 | i.setHint(R.string.field_net_name) | 52 | i.setHint(R.string.field_net_name) |
46 | 53 | ||
47 | @SuppressLint("InflateParams") | 54 | @SuppressLint("InflateParams") |
48 | val vg = layoutInflater.inflate(R.layout.dialog_frame, null) as ViewGroup | 55 | val vg = layoutInflater.inflate(R.layout.dialog_frame, main_content, false) as ViewGroup |
49 | vg.addView(i) | 56 | vg.addView(i) |
50 | 57 | ||
51 | AlertDialog.Builder(this) | 58 | AlertDialog.Builder(this) |
@@ -56,14 +63,7 @@ class StartActivity : BaseActivity() { | |||
56 | .show() | 63 | .show() |
57 | } | 64 | } |
58 | 65 | ||
59 | fun confDirDialog(@Suppress("UNUSED_PARAMETER") v: View) { | 66 | fun openConfigureActivity(@Suppress("UNUSED_PARAMETER") i: MenuItem) = startActivity(Intent(this, ConfigureActivity::class.java)) |
60 | AlertDialog.Builder(this) | ||
61 | .setTitle(R.string.title_tinc_config_dir) | ||
62 | .setMessage("Internal: " + AppPaths.confDir(AppPaths.Storage.INTERNAL) + "\n\n" + | ||
63 | "External: " + AppPaths.confDir(AppPaths.Storage.EXTERNAL)) | ||
64 | .setPositiveButton(R.string.action_close) { _, _ -> /* nop */ } | ||
65 | .show() | ||
66 | } | ||
67 | 67 | ||
68 | private fun startVpn(netName: String) { | 68 | private fun startVpn(netName: String) { |
69 | startService(Intent(this, TincVpnService::class.java).putExtra(TincVpnService.INTENT_EXTRA_NET_CONF, | 69 | startService(Intent(this, TincVpnService::class.java).putExtra(TincVpnService.INTENT_EXTRA_NET_CONF, |