9 files changed, 66 insertions, 48 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2822d37..8321208 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
         <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
         <application
+                android:name="org.pacien.tincapp.context.App"
                 android:allowBackup="false"
                 android:icon="@mipmap/ic_launcher"
                 android:label="@string/app_label"
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 6070a0a..2146cec 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -39,7 +39,7 @@ abstract class BaseActivity : AppCompatActivity() {
                 .setMessage(resources.getString(R.string.app_short_desc) + "\n\n" +
                         resources.getString(R.string.app_copyright) + " " +
                         resources.getString(R.string.app_license) + "\n\n" +
-                        AppInfo.all(resources))
+                        AppInfo.all())
                 .setNeutralButton(R.string.action_open_project_website) { _, _ -> openWebsite(R.string.app_website_url) }
                 .setPositiveButton(R.string.action_close) { _, _ -> /* nop */ }
                 .show()
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 71d5403..3807ddc 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
@@ -57,7 +57,7 @@ class StartActivity : BaseActivity() {
     }
 
     fun confDirDialog(@Suppress("UNUSED_PARAMETER") v: View) {
-        val confDir = AppPaths.confDir(this).path
+        val confDir = AppPaths.confDir().path
 
         AlertDialog.Builder(this)
                 .setTitle(R.string.title_tinc_config_dir)
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt b/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
index eb5689a..91a2678 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
@@ -1,6 +1,5 @@
 package org.pacien.tincapp.commands
 
-import android.content.Context
 import org.pacien.tincapp.context.AppPaths
 import java.io.IOException
 
@@ -9,22 +8,22 @@ import java.io.IOException
  */
 object Tinc {
 
-    private fun newCommand(ctx: Context, netName: String): Command =
-            Command(AppPaths.tinc(ctx).absolutePath)
-                    .withOption("config", AppPaths.confDir(ctx, netName).absolutePath)
-                    .withOption("pidfile", AppPaths.pidFile(ctx, netName).absolutePath)
+    private fun newCommand(netName: String): Command =
+            Command(AppPaths.tinc().absolutePath)
+                    .withOption("config", AppPaths.confDir(netName).absolutePath)
+                    .withOption("pidfile", AppPaths.pidFile(netName).absolutePath)
 
     // independently runnable commands
 
     @Throws(IOException::class)
-    fun network(ctx: Context): List<String> =
-            Executor.call(Command(AppPaths.tinc(ctx).absolutePath)
-                    .withOption("config", AppPaths.confDir(ctx).absolutePath)
+    fun network(): List<String> =
+            Executor.call(Command(AppPaths.tinc().absolutePath)
+                    .withOption("config", AppPaths.confDir().absolutePath)
                     .withArguments("network"))
 
     @Throws(IOException::class)
-    fun fsck(ctx: Context, netName: String, fix: Boolean): List<String> {
-        var cmd = newCommand(ctx, netName).withArguments("fsck")
+    fun fsck(netName: String, fix: Boolean): List<String> {
+        var cmd = newCommand(netName).withArguments("fsck")
         if (fix) cmd = cmd.withOption("force")
         return Executor.call(cmd)
     }
@@ -32,18 +31,18 @@ object Tinc {
     // commands requiring a running tinc daemon
 
     @Throws(IOException::class)
-    fun stop(ctx: Context, netName: String) {
-        Executor.call(newCommand(ctx, netName).withArguments("stop"))
+    fun stop(netName: String) {
+        Executor.call(newCommand(netName).withArguments("stop"))
     }
 
     @Throws(IOException::class)
-    fun dumpNodes(ctx: Context, netName: String, reachable: Boolean): List<String> =
+    fun dumpNodes(netName: String, reachable: Boolean): List<String> =
             Executor.call(
-                    if (reachable) newCommand(ctx, netName).withArguments("dump", "reachable", "nodes")
-                    else newCommand(ctx, netName).withArguments("dump", "nodes"))
+                    if (reachable) newCommand(netName).withArguments("dump", "reachable", "nodes")
+                    else newCommand(netName).withArguments("dump", "nodes"))
 
     @Throws(IOException::class)
-    fun info(ctx: Context, netName: String, node: String): String =
-            Executor.call(newCommand(ctx, netName).withArguments("info", node)).joinToString("\n")
+    fun info(netName: String, node: String): String =
+            Executor.call(newCommand(netName).withArguments("info", node)).joinToString("\n")
 
 }
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt b/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt
index 9f2491e..19ebfbd 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt
@@ -1,9 +1,6 @@
 package org.pacien.tincapp.commands
 
-import android.content.Context
-
 import org.pacien.tincapp.context.AppPaths
-
 import java.io.IOException
 
 /**
@@ -12,12 +9,12 @@ import java.io.IOException
 object Tincd {
 
     @Throws(IOException::class)
-    fun start(ctx: Context, netName: String, fd: Int) {
-        Executor.forkExec(Command(AppPaths.tincd(ctx).absolutePath)
+    fun start(netName: String, fd: Int) {
+        Executor.forkExec(Command(AppPaths.tincd().absolutePath)
                 .withOption("no-detach")
-                .withOption("config", AppPaths.confDir(ctx, netName).absolutePath)
-                .withOption("pidfile", AppPaths.pidFile(ctx, netName).absolutePath)
-                .withOption("logfile", AppPaths.logFile(ctx, netName).absolutePath)
+                .withOption("config", AppPaths.confDir(netName).absolutePath)
+                .withOption("pidfile", AppPaths.pidFile(netName).absolutePath)
+                .withOption("logfile", AppPaths.logFile(netName).absolutePath)
                 .withOption("option", "DeviceType=fd")
                 .withOption("option", "Device=" + fd))
     }
diff --git a/app/src/main/java/org/pacien/tincapp/context/App.kt b/app/src/main/java/org/pacien/tincapp/context/App.kt
new file mode 100644
index 0000000..4b7e44e
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/context/App.kt
@@ -0,0 +1,22 @@
+package org.pacien.tincapp.context
+
+import android.app.Application
+import android.content.Context
+
+/**
+ * @author pacien
+ */
+class App : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        appContext = applicationContext
+    }
+
+    companion object {
+        private var appContext: Context? = null
+        fun getContext() = appContext!!
+        fun getResources() = getContext().resources!!
+    }
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt b/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
index 2eb2aa1..39ef0f1 100644
--- a/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
@@ -1,6 +1,5 @@
 package org.pacien.tincapp.context
 
-import android.content.res.Resources
 import android.os.Build
 import org.pacien.tincapp.BuildConfig
 import org.pacien.tincapp.R
@@ -10,23 +9,23 @@ import org.pacien.tincapp.R
  */
 object AppInfo {
 
-    fun appVersion(r: Resources): String = r.getString(
+    fun appVersion(): String = App.getResources().getString(
             R.string.info_version_format,
             BuildConfig.VERSION_NAME,
             BuildConfig.BUILD_TYPE)
 
-    fun androidVersion(r: Resources): String = r.getString(
+    fun androidVersion():