11 files changed, 119 insertions, 61 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5611e4c..dc406f3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
 
         <uses-permission android:name="android.permission.INTERNET"/>
         <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+        <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
         <application
                 android:name="org.pacien.tincapp.context.App"
@@ -37,7 +38,7 @@
                 </activity>
 
                 <activity
-                        android:name=".activities.PromptActivity"
+                        android:name=".activities.LaunchActivity"
                         android:theme="@android:style/Theme.Translucent.NoTitleBar">
                         <intent-filter>
                                 <action android:name="org.pacien.tincapp.intent.action.CONNECT"/>
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
index 000320c..4904a66 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -1,8 +1,6 @@
 package org.pacien.tincapp.activities
 
 import android.app.ProgressDialog
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.support.annotation.StringRes
 import android.support.design.widget.Snackbar
@@ -13,6 +11,7 @@ import android.view.MenuItem
 import kotlinx.android.synthetic.main.base.*
 import org.pacien.tincapp.BuildConfig
 import org.pacien.tincapp.R
+import org.pacien.tincapp.context.App
 import org.pacien.tincapp.context.AppInfo
 
 /**
@@ -38,19 +37,16 @@ abstract class BaseActivity : AppCompatActivity() {
                         resources.getString(R.string.app_copyright) + " " +
                         resources.getString(R.string.app_license) + "\n\n" +
                         AppInfo.all())
-                .setNeutralButton(R.string.action_open_project_website) { _, _ -> openWebsite(R.string.app_website_url) }
-                .setPositiveButton(R.string.action_close, dismiss)
+                .setNeutralButton(R.string.action_open_project_website) { _, _ -> App.openURL(resources.getString(R.string.app_website_url)) }
+                .setPositiveButton(R.string.action_close, App.dismissAction)
                 .show()
     }
 
-    protected fun openWebsite(@StringRes url: Int) = startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(resources.getString(url))))
     protected fun notify(@StringRes msg: Int) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show()
     protected fun notify(msg: String) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show()
     protected fun showProgressDialog(@StringRes msg: Int): ProgressDialog = ProgressDialog.show(this, null, getString(msg), true, false)
     protected fun showErrorDialog(msg: String): AlertDialog = AlertDialog.Builder(this)
             .setTitle(R.string.title_error).setMessage(msg)
-            .setPositiveButton(R.string.action_close, dismiss).show()
-
-    protected val dismiss = { _: Any, _: Any -> /* nop */ }
+            .setPositiveButton(R.string.action_close, App.dismissAction).show()
 
 }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
index b030a85..ea37944 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
@@ -13,6 +13,7 @@ import kotlinx.android.synthetic.main.page_configure.*
 import org.pacien.tincapp.R
 import org.pacien.tincapp.commands.Tinc
 import org.pacien.tincapp.commands.TincApp
+import org.pacien.tincapp.context.App
 import org.pacien.tincapp.context.AppPaths
 import org.pacien.tincapp.extensions.Java.exceptionallyAccept
 
@@ -43,7 +44,7 @@ class ConfigureActivity : BaseActivity() {
 
         AlertDialog.Builder(this).setTitle(R.string.title_new_network).setView(dialogFrame)
                 .setPositiveButton(R.string.action_create) { _, _ -> generateConf(netNameField.text.toString(), nodeNameField.text.toString()) }
-                .setNegativeButton(R.string.action_cancel, dismiss).show()
+                .setNegativeButton(R.string.action_cancel, App.dismissAction).show()
     }
 
     fun openJoinNetworkDialog(@Suppress("UNUSED_PARAMETER") v: View) {
@@ -61,7 +62,7 @@ class ConfigureActivity : BaseActivity() {
 
         AlertDialog.Builder(this).setTitle(R.string.title_join_network).setView(dialogFrame)
                 .setPositiveButton(R.string.action_join) { _, _ -> joinNetwork(netNameField.text.toString(), joinUrlField.text.toString()) }
-                .setNegativeButton(R.string.action_cancel, dismiss).show()
+                .setNegativeButton(R.string.action_cancel, App.dismissAction).show()
     }
 
     private fun writeContent() {
diff --git a/app/src/main/java/org/pacien/tincapp/activities/PromptActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/LaunchActivity.kt
index 6310d63..6eb630d 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/PromptActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/LaunchActivity.kt
@@ -5,7 +5,6 @@ import android.content.Intent
 import android.net.Uri
 import android.net.VpnService
 import android.os.Bundle
-import org.pacien.tincapp.BuildConfig
 import org.pacien.tincapp.context.App
 import org.pacien.tincapp.intent.action.ACTION_CONNECT
 import org.pacien.tincapp.intent.action.ACTION_DISCONNECT
@@ -15,13 +14,13 @@ import org.pacien.tincapp.service.TincVpnService
 /**
  * @author pacien
  */
-class PromptActivity : Activity() {
+class LaunchActivity : Activity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         when (intent.action) {
-            ACTION_CONNECT -> connect()
+            ACTION_CONNECT -> requestPerm()
             ACTION_DISCONNECT -> disconnect()
         }
     }
@@ -31,7 +30,7 @@ class PromptActivity : Activity() {
         finish()
     }
 
-    private fun connect() = VpnService.prepare(this).let {
+    private fun requestPerm() = VpnService.prepare(this).let {
         if (it != null)
             startActivityForResult(it, 0)
         else
@@ -46,14 +45,14 @@ class PromptActivity : Activity() {
     companion object {
 
         fun connect(netName: String) {
-            App.getContext().startActivity(Intent(App.getContext(), PromptActivity::class.java)
+            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).build()))
         }
 
         fun disconnect() {
-            App.getContext().startActivity(Intent(App.getContext(), PromptActivity::class.java)
+            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 e49e261..6ef8974 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt