From 957826db1e46bffcd99ee52f21101728279521b9 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 20 Aug 2018 16:52:49 +0200 Subject: Refactor start activity --- .../tincapp/activities/start/ConnectionStarter.kt | 69 ++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt (limited to 'app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt') 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 new file mode 100644 index 0000000..9e7e59d --- /dev/null +++ b/app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt @@ -0,0 +1,69 @@ +/* + * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon + * Copyright (C) 2017-2018 Pacien TRAN-GIRARD + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.pacien.tincapp.activities.start + +import android.net.VpnService +import android.support.v7.app.AlertDialog +import kotlinx.android.synthetic.main.base.* +import kotlinx.android.synthetic.main.dialog_decrypt_keys.view.* +import org.pacien.tincapp.R +import org.pacien.tincapp.service.TincVpnService +import org.pacien.tincapp.utils.TincKeyring + +/** + * @author pacien + */ +class ConnectionStarter(private val parentActivity: StartActivity) { + private var netName: String? = null + private var passphrase: String? = null + private var displayStatus = false + + fun displayStatus() = displayStatus + + fun tryStart(netName: String? = null, passphrase: String? = null, displayStatus: Boolean? = null) { + if (netName != null) this.netName = netName + this.passphrase = passphrase + if (displayStatus != null) this.displayStatus = displayStatus + + val permissionRequestIntent = VpnService.prepare(parentActivity) + if (permissionRequestIntent != null) + return parentActivity.startActivityForResult(permissionRequestIntent, parentActivity.permissionRequestCode) + + if (TincKeyring.needsPassphrase(this.netName!!) && this.passphrase == null) + return askForPassphrase() + + startVpn(this.netName!!, this.passphrase) + } + + private fun askForPassphrase() { + val dialogView = parentActivity.layoutInflater.inflate(R.layout.dialog_decrypt_keys, parentActivity.main_content, false) + + AlertDialog.Builder(parentActivity) + .setTitle(R.string.title_unlock_private_keys) + .setView(dialogView) + .setPositiveButton(R.string.action_unlock) { _, _ -> tryStart(passphrase = dialogView.passphrase.text.toString()) } + .setNegativeButton(R.string.action_cancel) { _, _ -> Unit } + .show() + } + + private fun startVpn(netName: String, passphrase: String? = null) { + parentActivity.showConnectProgressDialog() + TincVpnService.connect(netName, passphrase) + } +} -- cgit v1.2.3