Refactor activities and service, locking app at daemon startup and shutdown

11 files changed, 323 insertions, 240 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f03a640..6826920 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,6 +24,11 @@
                                 <action android:name="android.intent.action.MAIN"/>
                                 <category android:name="android.intent.category.LAUNCHER"/>
                         </intent-filter>
+                        <intent-filter>
+                                <action android:name="org.pacien.tincapp.intent.action.CONNECT"/>
+                                <data android:scheme="tinc"/>
+                                <category android:name="android.intent.category.DEFAULT"/>
+                        </intent-filter>
                 </activity>
 
                 <activity
@@ -37,16 +42,6 @@
                         android:name=".activities.StatusActivity"
                         android:configChanges="orientation|screenSize"
                         android:theme="@style/AppTheme.NoActionBar">
-                </activity>
-
-                <activity
-                        android:name=".activities.LaunchActivity"
-                        android:theme="@style/AppTheme.NoActionBar">
-                        <intent-filter>
-                                <action android:name="org.pacien.tincapp.intent.action.CONNECT"/>
-                                <data android:scheme="tinc"/>
-                                <category android:name="android.intent.category.DEFAULT"/>
-                        </intent-filter>
                         <intent-filter>
                                 <action android:name="org.pacien.tincapp.intent.action.DISCONNECT"/>
                                 <category android:name="android.intent.category.DEFAULT"/>
diff --git a/app/src/main/java/org/pacien/tincapp/activities/LaunchActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/LaunchActivity.kt
deleted file mode 100644
index 0179040..0000000
--- a/app/src/main/java/org/pacien/tincapp/activities/LaunchActivity.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.pacien.tincapp.activities
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.Intent
-import android.net.Uri
-import android.net.VpnService
-import android.os.Bundle
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
-import kotlinx.android.synthetic.main.dialog_decrypt_keys.view.*
-import org.pacien.tincapp.R
-import org.pacien.tincapp.commands.TincApp
-import org.pacien.tincapp.context.App
-import org.pacien.tincapp.intent.action.ACTION_CONNECT
-import org.pacien.tincapp.intent.action.ACTION_DISCONNECT
-import org.pacien.tincapp.intent.action.TINC_SCHEME
-import org.pacien.tincapp.service.TincVpnService
-import org.pacien.tincapp.utils.PemUtils
-import java.io.FileNotFoundException
-
-/**
- * @author pacien
- */
-class LaunchActivity : AppCompatActivity() {
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-
-    when (intent.action) {
-      ACTION_CONNECT -> requestPerm()
-      ACTION_DISCONNECT -> disconnect()
-    }
-  }
-
-  override fun onActivityResult(request: Int, result: Int, data: Intent?) {
-    if (request == PERMISSION_REQUEST_CODE && result == Activity.RESULT_OK) askPassphrase()
-  }
-
-  private fun requestPerm() = VpnService.prepare(this).let {
-    if (it != null)
-      startActivityForResult(it, PERMISSION_REQUEST_CODE)
-    else
-      onActivityResult(PERMISSION_REQUEST_CODE, Activity.RESULT_OK, null)
-  }
-
-  @SuppressLint("InflateParams")
-  private fun askPassphrase() {
-    val netName = intent.data.schemeSpecificPart
-
-    if (needPassphrase(netName) && intent.data.fragment == null) {
-      val dialog = layoutInflater.inflate(R.layout.dialog_decrypt_keys, null, false)
-      AlertDialog.Builder(this)
-        .setTitle(R.string.title_unlock_private_keys).setView(dialog)
-        .setPositiveButton(R.string.action_unlock) { _, _ -> connect(netName, dialog.passphrase.text.toString()) }
-        .setNegativeButton(R.string.action_cancel, { _, _ -> finish() })
-        .show()
-    } else {
-      connect(netName, intent.data.fragment)
-    }
-  }
-
-  private fun needPassphrase(netName: String) = try {
-    TincApp.listPrivateKeys(netName).filter { it.exists() }.any { PemUtils.isEncrypted(PemUtils.read(it)) }
-  } catch (e: FileNotFoundException) {
-    false
-  }
-
-  private fun connect(netName: String, passphrase: String? = null) {
-    TincVpnService.startVpn(netName, passphrase)
-    finish()
-  }
-
-  private fun disconnect() {
-    TincVpnService.stopVpn()
-    finish()
-  }
-
-  companion object {
-
-    private val PERMISSION_REQUEST_CODE = 0
-
-    fun connect(netName: String, passphrase: String? = null) {
-      App.getContext().startActivity(Intent(App.getContext(), LaunchActivity::class.java)
-        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        .setAction(ACTION_CONNECT)
-        .setData(Uri.Builder().scheme(TINC_SCHEME).opaquePart(netName).fragment(passphrase).build()))
-    }
-
-    fun disconnect() {
-      App.getContext().startActivity(Intent(App.getContext(), LaunchActivity::class.java)
-        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        .setAction(ACTION_DISCONNECT))
-    }
-
-  }
-
-}
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 719bbc1..9fa5e44 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
@@ -1,8 +1,13 @@
 package org.pacien.tincapp.activities
 
+import android.app.Activity
+import android.app.ProgressDialog
 import android.content.Intent
+import android.content.IntentFilter
+import android.net.VpnService
 import android.os.Bundle
 import android.support.v4.widget.SwipeRefreshLayout
+import android.support.v7.app.AlertDialog
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -10,29 +15,117 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.TextView
 import kotlinx.android.synthetic.main.base.*
+import kotlinx.android.synthetic.main.dialog_decrypt_keys.view.*
 import kotlinx.android.synthetic.main.fragment_list_view.*
 import kotlinx.android.synthetic.main.fragment_network_list_header.*
 import org.pacien.tincapp.R
 import org.pacien.tincapp.context.AppPaths
 import org.pacien.tincapp.extensions.Android.setElements
+import org.pacien.tincapp.intent.Actions
+import org.pacien.tincapp.intent.SimpleBroadcastReceiver
 import org.pacien.tincapp.service.TincVpnService
+import org.pacien.tincapp.utils.TincKeyring
 
 /**
  * @author pacien
  */
-class StartActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRefreshLayout.OnRefreshListener {
+class StartActivity : BaseActivity() {
+  companion object {
+    private const val PERMISSION_REQUEST = 0
+  }
+
+  private val networkList = object : AdapterView.OnItemClickListener, SwipeRefreshLayout.OnRefreshListener {
+    private var networkListAdapter: ArrayAdapter<String>? = null
+
+    fun init() {
+      networkListAdapter = ArrayAdapter(this@StartActivity, R.layout.fragment_list_item)