diff options
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt b/app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt index d1ccd3f..c0c6e02 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | 2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon |
3 | * Copyright (C) 2017-2018 Pacien TRAN-GIRARD | 3 | * Copyright (C) 2017-2019 Pacien TRAN-GIRARD |
4 | * | 4 | * |
5 | * This program is free software: you can redistribute it and/or modify | 5 | * This program is free software: you can redistribute it and/or modify |
6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
@@ -20,11 +20,13 @@ package org.pacien.tincapp.activities.start | |||
20 | 20 | ||
21 | import android.net.VpnService | 21 | import android.net.VpnService |
22 | import android.support.v7.app.AlertDialog | 22 | import android.support.v7.app.AlertDialog |
23 | import android.view.inputmethod.EditorInfo | ||
23 | import kotlinx.android.synthetic.main.base_activity.* | 24 | import kotlinx.android.synthetic.main.base_activity.* |
24 | import kotlinx.android.synthetic.main.dialog_decrypt_keys.view.* | 25 | import kotlinx.android.synthetic.main.dialog_decrypt_keys.view.* |
25 | import org.pacien.tincapp.R | 26 | import org.pacien.tincapp.R |
26 | import org.pacien.tincapp.service.TincVpnService | 27 | import org.pacien.tincapp.service.TincVpnService |
27 | import org.pacien.tincapp.utils.TincKeyring | 28 | import org.pacien.tincapp.utils.TincKeyring |
29 | import org.pacien.tincapp.extensions.View.on | ||
28 | 30 | ||
29 | /** | 31 | /** |
30 | * @author pacien | 32 | * @author pacien |
@@ -54,12 +56,19 @@ class ConnectionStarter(private val parentActivity: StartActivity) { | |||
54 | private fun askForPassphrase() { | 56 | private fun askForPassphrase() { |
55 | val dialogView = parentActivity.layoutInflater.inflate(R.layout.dialog_decrypt_keys, parentActivity.base_activity_frame, false) | 57 | val dialogView = parentActivity.layoutInflater.inflate(R.layout.dialog_decrypt_keys, parentActivity.base_activity_frame, false) |
56 | 58 | ||
57 | AlertDialog.Builder(parentActivity) | 59 | val dialog = AlertDialog.Builder(parentActivity) |
58 | .setTitle(R.string.decrypt_key_modal_title) | 60 | .setTitle(R.string.decrypt_key_modal_title) |
59 | .setView(dialogView) | 61 | .setView(dialogView) |
60 | .setPositiveButton(R.string.decrypt_key_modal_action_unlock) { _, _ -> tryStart(passphrase = dialogView.passphrase.text.toString()) } | 62 | .setPositiveButton(R.string.decrypt_key_modal_action_unlock) { _, _ -> tryStart(passphrase = dialogView.passphrase.text.toString()) } |
61 | .setNegativeButton(R.string.decrypt_key_modal_action_cancel) { _, _ -> Unit } | 63 | .setNegativeButton(R.string.decrypt_key_modal_action_cancel) { _, _ -> Unit } |
62 | .show() | 64 | .create() |
65 | |||
66 | dialogView.passphrase.on(EditorInfo.IME_ACTION_DONE) { | ||
67 | dialog.dismiss() | ||
68 | tryStart(passphrase = dialogView.passphrase.text.toString()) | ||
69 | } | ||
70 | |||
71 | dialog.show() | ||
63 | } | 72 | } |
64 | 73 | ||
65 | private fun startVpn(netName: String, passphrase: String? = null) { | 74 | private fun startVpn(netName: String, passphrase: String? = null) { |