Use global app context

3 files changed, 39 insertions, 18 deletions

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(): String = App.getResources().getString(
             R.string.info_running_on_format,
             Build.VERSION.CODENAME,
             Build.VERSION.RELEASE)
 
-    fun supportedABIs(r: Resources): String = r.getString(
+    fun supportedABIs(): String = App.getResources().getString(
             R.string.info_supported_abis_format,
             Build.SUPPORTED_ABIS.joinToString(","))
 
-    fun all(r: Resources): String = listOf(
-            appVersion(r),
-            androidVersion(r),
-            supportedABIs(r)).joinToString("\n")
+    fun all(): String = listOf(
+            appVersion(),
+            androidVersion(),
+            supportedABIs()).joinToString("\n")
 
 }
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt b/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
index 21db0a4..06bb318 100644
--- a/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
@@ -29,15 +29,15 @@ object AppPaths {
         return f
     }
 
-    fun confDir(ctx: Context): File = ctx.getDir(CONFDIR, Context.MODE_PRIVATE)
-    fun confDir(ctx: Context, netName: String): File = File(confDir(ctx), netName)
-    fun logDir(ctx: Context): File = createDirIfNotExists(ctx.cacheDir, LOGDIR)
-    fun pidDir(ctx: Context): File = createDirIfNotExists(ctx.cacheDir, PIDDIR)
-    fun logFile(ctx: Context, netName: String): File = File(logDir(ctx), String.format(LOGFILE_FORMAT, netName))
-    fun pidFile(ctx: Context, netName: String): File = File(pidDir(ctx), String.format(PIDFILE_FORMAT, netName))
-    fun netConfFile(ctx: Context, netName: String): File = File(confDir(ctx, netName), NET_CONF_FILE)
-    fun binDir(ctx: Context): File = File(ctx.applicationInfo.nativeLibraryDir)
-    fun tincd(ctx: Context): File = File(binDir(ctx), TINCD_BIN)
-    fun tinc(ctx: Context): File = File(binDir(ctx), TINC_BIN)
+    fun confDir(): File = App.getContext().getDir(CONFDIR, Context.MODE_PRIVATE)
+    fun confDir(netName: String): File = File(confDir(), netName)
+    fun logDir(): File = createDirIfNotExists(App.getContext().cacheDir, LOGDIR)
+    fun pidDir(): File = createDirIfNotExists(App.getContext().cacheDir, PIDDIR)
+    fun logFile(netName: String): File = File(logDir(), String.format(LOGFILE_FORMAT, netName))
+    fun pidFile(netName: String): File = File(pidDir(), String.format(PIDFILE_FORMAT, netName))
+    fun netConfFile(netName: String): File = File(confDir(netName), NET_CONF_FILE)
+    fun binDir(): File = File(App.getContext().applicationInfo.nativeLibraryDir)
+    fun tincd(): File = File(binDir(), TINCD_BIN)
+    fun tinc(): File = File(binDir(), TINC_BIN)
 
 }