23 files changed, 453 insertions, 250 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 054438e..70839b7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
                 tools:ignore="GoogleAppIndexingWarning">
 
                 <activity
-                        android:name=".activities.StartActivity"
+                        android:name=".activities.start.StartActivity"
                         android:configChanges="orientation|screenSize"
                         android:label="@string/app_name">
                         <intent-filter>
@@ -51,7 +51,7 @@
                 <activity
                         android:name=".activities.configure.ConfigureActivity"
                         android:configChanges="orientation|screenSize"
-                        android:parentActivityName=".activities.StartActivity">
+                        android:parentActivityName=".activities.start.StartActivity">
                 </activity>
 
                 <activity
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
deleted file mode 100644
index 7023316..0000000
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * 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 <https://www.gnu.org/licenses/>.
- */
-
-package org.pacien.tincapp.activities
-
-import android.app.Activity
-import android.content.Intent
-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
-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.activities.common.ProgressModal
-import org.pacien.tincapp.activities.configure.ConfigureActivity
-import org.pacien.tincapp.activities.status.StatusActivity
-import org.pacien.tincapp.context.AppPaths
-import org.pacien.tincapp.extensions.setElements
-import org.pacien.tincapp.intent.Actions
-import org.pacien.tincapp.intent.BroadcastMapper
-import org.pacien.tincapp.service.TincVpnService
-import org.pacien.tincapp.utils.TincKeyring
-
-/**
- * @author pacien
- */
-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)
-      layoutInflater.inflate(R.layout.fragment_list_view, main_content)
-      list_wrapper.setOnRefreshListener(this)
-      list.addHeaderView(layoutInflater.inflate(R.layout.fragment_network_list_header, list, false), null, false)
-      list.addFooterView(View(this@StartActivity), null, false)
-      list.adapter = networkListAdapter
-      list.onItemClickListener = this
-    }
-
-    fun destroy() {
-      networkListAdapter = null
-    }
-
-    override fun onRefresh() {
-      val networks = AppPaths.confDir().list()?.sorted() ?: emptyList()
-      runOnUiThread {
-        networkListAdapter?.setElements(networks)
-        setPlaceholderVisibility()
-        list_wrapper.isRefreshing = false
-      }
-    }
-
-    override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-      connectionStarter.tryStart(netName = (view as TextView).text.toString(), displayStatus = true)
-    }
-
-    private fun setPlaceholderVisibility() = if (networkListAdapter?.isEmpty != false) {
-      network_list_placeholder.text = getListPlaceholderText()
-      network_list_placeholder.visibility = View.VISIBLE
-    } else {
-      network_list_placeholder.visibility = View.GONE
-    }
-
-    private fun getListPlaceholderText() = if (!AppPaths.storageAvailable()) {
-      getText(R.string.message_storage_unavailable)
-    } else {
-      getText(R.string.message_no_network_configuration_found)
-    }
-  }
-
-  private val connectionStarter = object {
-    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(this@StartActivity)
-      if (permissionRequestIntent != null)
-        return startActivityForResult(permissionRequestIntent, PERMISSION_REQUEST)
-
-      if (TincKeyring.needsPassphrase(this.netName!!) && this.passphrase == null)
-        return askForPassphrase()
-
-      startVpn(this.netName!!, this.passphrase)
-    }
-
-    private fun askForPassphrase() {
-      layoutInflater.inflate(R.layout.dialog_decrypt_keys, main_content, false).let { dialog ->
-        AlertDialog.Builder(this@StartActivity)
-          .setTitle(R.string.title_unlock_private_keys).setView(dialog)
-          .setPositiveButton(R.string.action_unlock) { _, _ -> tryStart(passphrase = dialog.passphrase.text.toString()) }
-          .setNegativeButton(R.string.action_cancel) { _, _ -> Unit }
-          .show()
-      }
-    }
-
-    private fun startVpn(netName: String, passphrase: String? = null) {
-      connectDialog = ProgressModal.show(this@StartActivity, getString(R.string.message_starting_vpn))
-      TincVpnService.connect(netName, passphrase)
-    }
-  }
-
-  private val broadcastMapper = BroadcastMapper(mapOf(
-    Actions.EVENT_CONNECTED to this::onVpnStart,
-    Actions.EVENT_ABORTED to this::onVpnStartError))
-
-  private var connectDialog: AlertDialog? = null
-
-  override fun onCreate(savedInstanceState: Bundle?) {