From ab577b06a6eaa9b8dd950b79b658ed8c08eef1c9 Mon Sep 17 00:00:00 2001
From: Pacien TRAN-GIRARD
Date: Mon, 3 Jul 2017 17:59:30 +0200
Subject: Drop useless support for configuration in internal storage

---
 .../java/org/pacien/tincapp/context/AppPaths.kt    | 26 +++++-----------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'app/src/main/java/org/pacien/tincapp/context/AppPaths.kt')

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 58c6de2..078a81d 100644
--- a/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
@@ -1,7 +1,6 @@
 package org.pacien.tincapp.context
 
 import java.io.File
-import java.io.Serializable
 
 /**
  * @author pacien
@@ -10,9 +9,6 @@ import java.io.Serializable
  */
 object AppPaths {
 
-    enum class Storage { INTERNAL, EXTERNAL }
-    data class NetConf(val storage: Storage, val netName: String) : Serializable
-
     private val TINCD_BIN = "libtincd.so"
     private val TINC_BIN = "libtinc.so"
 
@@ -21,24 +17,14 @@ object AppPaths {
 
     private val NET_CONF_FILE = "network.conf"
 
-    fun filesDir(storage: Storage): File = when (storage) {
-        Storage.INTERNAL -> App.getContext().filesDir
-        Storage.EXTERNAL -> App.getContext().getExternalFilesDir(null)
-    }
-
-    fun cacheDir(storage: Storage): File = when (storage) {
-        Storage.INTERNAL -> App.getContext().cacheDir
-        Storage.EXTERNAL -> App.getContext().externalCacheDir
-    }
-
+    fun cacheDir() = App.getContext().externalCacheDir!!
+    fun confDir() = App.getContext().getExternalFilesDir(null)!!
     fun binDir() = File(App.getContext().applicationInfo.nativeLibraryDir)
 
-    fun confDir(storage: Storage) = filesDir(storage)
-    fun confDir(netConf: NetConf) = File(confDir(netConf.storage), netConf.netName)
-
-    fun netConfFile(netConf: NetConf) = File(confDir(netConf), NET_CONF_FILE)
-    fun logFile(netConf: NetConf) = File(cacheDir(netConf.storage), String.format(LOGFILE_FORMAT, netConf.netName))
-    fun pidFile(netConf: NetConf) = File(cacheDir(Storage.INTERNAL), String.format(PIDFILE_FORMAT, netConf.netName))
+    fun confDir(netName: String) = File(confDir(), netName)
+    fun netConfFile(netName: String) = File(confDir(netName), NET_CONF_FILE)
+    fun logFile(netName: String) = File(cacheDir(), String.format(LOGFILE_FORMAT, netName))
+    fun pidFile(netName: String) = File(App.getContext().cacheDir, String.format(PIDFILE_FORMAT, netName))
 
     fun tincd() = File(binDir(), TINCD_BIN)
     fun tinc() = File(binDir(), TINC_BIN)
-- 
cgit v1.2.3