diff options
author | pacien | 2017-11-07 20:38:57 +0100 |
---|---|---|
committer | pacien | 2017-11-07 20:38:57 +0100 |
commit | 807a1008cad5c9d100dd7038f3872553576c7be6 (patch) | |
tree | 328b5a22a79bd03b53cdd6aecfa62bd2503feabc /app/src/main/java/org/pacien/tincapp/context/AppPaths.kt | |
parent | 24dbee4690fd102d9b723765fba5799c5790b001 (diff) | |
download | tincapp-807a1008cad5c9d100dd7038f3872553576c7be6.tar.gz |
Handle unavailable "external" storage ;
Remove network list observer
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/context/AppPaths.kt')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/context/AppPaths.kt | 10 |
1 files changed, 7 insertions, 3 deletions
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 94780cc..005cded 100644 --- a/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt +++ b/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt | |||
@@ -1,11 +1,12 @@ | |||
1 | package org.pacien.tincapp.context | 1 | package org.pacien.tincapp.context |
2 | 2 | ||
3 | import android.os.Environment | ||
3 | import java.io.File | 4 | import java.io.File |
4 | import java.io.FileNotFoundException | 5 | import java.io.FileNotFoundException |
5 | 6 | ||
6 | /** | 7 | /** |
7 | * @author pacien | 8 | * @author pacien |
8 | * * | 9 | * |
9 | * @implNote Logs and PID files are stored in the cache directory for easy clean up. | 10 | * @implNote Logs and PID files are stored in the cache directory for easy clean up. |
10 | */ | 11 | */ |
11 | object AppPaths { | 12 | object AppPaths { |
@@ -23,8 +24,11 @@ object AppPaths { | |||
23 | private val NET_DEFAULT_ED25519_PRIVATE_KEY_FILE = "ed25519_key.priv" | 24 | private val NET_DEFAULT_ED25519_PRIVATE_KEY_FILE = "ed25519_key.priv" |
24 | private val NET_DEFAULT_RSA_PRIVATE_KEY_FILE = "rsa_key.priv" | 25 | private val NET_DEFAULT_RSA_PRIVATE_KEY_FILE = "rsa_key.priv" |
25 | 26 | ||
26 | fun cacheDir() = App.getContext().externalCacheDir!! | 27 | fun storageAvailable() = |
27 | fun confDir() = App.getContext().getExternalFilesDir(null)!! | 28 | Environment.getExternalStorageState().let { it == Environment.MEDIA_MOUNTED && it != Environment.MEDIA_MOUNTED_READ_ONLY } |
29 | |||
30 | fun cacheDir() = App.getContext().externalCacheDir | ||
31 | fun confDir() = App.getContext().getExternalFilesDir(null) | ||
28 | fun binDir() = File(App.getContext().applicationInfo.nativeLibraryDir) | 32 | fun binDir() = File(App.getContext().applicationInfo.nativeLibraryDir) |
29 | 33 | ||
30 | fun confDir(netName: String) = File(confDir(), netName) | 34 | fun confDir(netName: String) = File(confDir(), netName) |