Conversion to Kotlin

4 files changed, 75 insertions, 117 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/context/AppInfo.java b/app/src/main/java/org/pacien/tincapp/context/AppInfo.java
deleted file mode 100644
index 075402d..0000000
--- a/app/src/main/java/org/pacien/tincapp/context/AppInfo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.pacien.tincapp.context;
-
-import android.content.res.Resources;
-import android.os.Build;
-
-import com.annimon.stream.Stream;
-
-import org.pacien.tincapp.BuildConfig;
-import org.pacien.tincapp.R;
-
-/**
- * @author pacien
- */
-final public class AppInfo {
-
-        private AppInfo() {
-                // static class
-        }
-
-        static public String appVersion(Resources r) {
-                return r.getString(R.string.info_version_format,
-                                BuildConfig.VERSION_NAME,
-                                BuildConfig.BUILD_TYPE);
-        }
-
-        static public String androidVersion(Resources r) {
-                return r.getString(R.string.info_running_on_format,
-                                Build.VERSION.CODENAME,
-                                Build.VERSION.RELEASE);
-        }
-
-        static public String supportedABIs(Resources r) {
-                return r.getString(R.string.info_supported_abis_format,
-                                Stream.of(Build.SUPPORTED_ABIS).reduce((x, y) -> x + "," + y).get());
-        }
-
-        static public String all(Resources r) {
-                return Stream.of(appVersion(r), androidVersion(r), supportedABIs(r))
-                                .reduce((x, y) -> x + '\n' + y).get();
-        }
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt b/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
new file mode 100644
index 0000000..2eb2aa1
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
@@ -0,0 +1,32 @@
+package org.pacien.tincapp.context
+
+import android.content.res.Resources
+import android.os.Build
+import org.pacien.tincapp.BuildConfig
+import org.pacien.tincapp.R
+
+/**
+ * @author pacien
+ */
+object AppInfo {
+
+    fun appVersion(r: Resources): String = r.getString(
+            R.string.info_version_format,
+            BuildConfig.VERSION_NAME,
+            BuildConfig.BUILD_TYPE)
+
+    fun androidVersion(r: Resources): String = r.getString(
+            R.string.info_running_on_format,
+            Build.VERSION.CODENAME,
+            Build.VERSION.RELEASE)
+
+    fun supportedABIs(r: Resources): String = r.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")
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppPaths.java b/app/src/main/java/org/pacien/tincapp/context/AppPaths.java
deleted file mode 100644
index d854d4e..0000000
--- a/app/src/main/java/org/pacien/tincapp/context/AppPaths.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.pacien.tincapp.context;
-
-import android.content.Context;
-
-import java.io.File;
-
-/**
- * @author pacien
- * @implNote Logs and PID files are stored in the cache directory for easy clean up.
- */
-final public class AppPaths {
-
-        private AppPaths() {
-                // static class
-        }
-
-        static final private String CONFDIR = "conf";
-        static final private String LOGDIR = "log";
-        static final private String PIDDIR = "pid";
-
-        static final private String TINCD_BIN = "libtincd.so";
-        static final private String TINC_BIN = "libtinc.so";
-
-        static final private String LOGFILE_FORMAT = "tinc.%s.log";
-        static final private String PIDFILE_FORMAT = "tinc.%s.pid";
-
-        static final private String NET_CONF_FILE = "network.conf";
-
-        static private File createDirIfNotExists(File basePath, String newDir) {
-                File f = new File(basePath, newDir);
-                f.mkdirs();
-                return f;
-        }
-
-        static public File confDir(Context ctx) {
-                return ctx.getDir(CONFDIR, Context.MODE_PRIVATE);
-        }
-
-        static public File confDir(Context ctx, String netName) {
-                return new File(confDir(ctx), netName);
-        }
-
-        static public File logDir(Context ctx) {
-                return createDirIfNotExists(ctx.getCacheDir(), LOGDIR);
-        }
-
-        static public File pidDir(Context ctx) {
-                return createDirIfNotExists(ctx.getCacheDir(), PIDDIR);
-        }
-
-        static public File logFile(Context ctx, String netName) {
-                return new File(logDir(ctx), String.format(LOGFILE_FORMAT, netName));
-        }
-
-        static public File pidFile(Context ctx, String netName) {
-                return new File(pidDir(ctx), String.format(PIDFILE_FORMAT, netName));
-        }
-
-        static public File netConfFile(Context ctx, String netName) {
-                return new File(confDir(ctx, netName), NET_CONF_FILE);
-        }
-
-        static public File binDir(Context ctx) {
-                return new File(ctx.getApplicationInfo().nativeLibraryDir);
-        }
-
-        static public File tincd(Context ctx) {
-                return new File(binDir(ctx), TINCD_BIN);
-        }
-
-        static public File tinc(Context ctx) {
-                return new File(binDir(ctx), TINC_BIN);
-        }
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt b/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
new file mode 100644
index 0000000..21db0a4
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
@@ -0,0 +1,43 @@
+package org.pacien.tincapp.context
+
+import android.content.Context
+
+import java.io.File
+
+/**
+ * @author pacien
+ * *
+ * @implNote Logs and PID files are stored in the cache directory for easy clean up.
+ */
+object AppPaths {
+
+    private val CONFDIR = "conf"
+    private val LOGDIR = "log"
+    private val PIDDIR = "pid"
+
+    private val TINCD_BIN = "libtincd.so"
+    private val TINC_BIN = "libtinc.so"
+
+    private val LOGFILE_FORMAT = "tinc.%s.log"
+    private val PIDFILE_FORMAT = "tinc.%s.pid"
+
+    private val NET_CONF_FILE = "network.conf"
+
+    private fun createDirIfNotExists(basePath: File, newDir: String): File {
+        val f = File(basePath, newDir)
+        f.mkdirs()
+        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)
+
+}