diff options
author | Pacien TRAN-GIRARD | 2017-07-01 16:24:22 +0200 |
---|---|---|
committer | Pacien TRAN-GIRARD | 2017-07-01 16:24:22 +0200 |
commit | 3e3135b0c7fba811735a30e7fd155ca1e188c787 (patch) | |
tree | 71635795e40dd95c5cf2fd99f4435d8332125a5d /app/src/main/java/org/pacien/tincapp/context | |
parent | 85a3892d4ecad4aae98f062e824f54e477bf8912 (diff) | |
download | tincapp-3e3135b0c7fba811735a30e7fd155ca1e188c787.tar.gz |
Use global app context
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/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 @@ | |||
1 | package org.pacien.tincapp.context | ||
2 | |||
3 | import android.app.Application | ||
4 | import android.content.Context | ||
5 | |||
6 | /** | ||
7 | * @author pacien | ||
8 | */ | ||
9 | class App : Application() { | ||
10 | |||
11 | override fun onCreate() { | ||
12 | super.onCreate() | ||
13 | appContext = applicationContext | ||
14 | } | ||
15 | |||
16 | companion object { | ||
17 | private var appContext: Context? = null | ||
18 | fun getContext() = appContext!! | ||
19 | fun getResources() = getContext().resources!! | ||
20 | } | ||
21 | |||
22 | } | ||
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 @@ | |||
1 | package org.pacien.tincapp.context | 1 | package org.pacien.tincapp.context |
2 | 2 | ||
3 | import android.content.res.Resources | ||
4 | import android.os.Build | 3 | import android.os.Build |
5 | import org.pacien.tincapp.BuildConfig | 4 | import org.pacien.tincapp.BuildConfig |
6 | import org.pacien.tincapp.R | 5 | import org.pacien.tincapp.R |
@@ -10,23 +9,23 @@ import org.pacien.tincapp.R | |||
10 | */ | 9 | */ |
11 | object AppInfo { | 10 | object AppInfo { |
12 | 11 | ||
13 | fun appVersion(r: Resources): String = r.getString( | 12 | fun appVersion(): String = App.getResources().getString( |
14 | R.string.info_version_format, | 13 | R.string.info_version_format, |
15 | BuildConfig.VERSION_NAME, | 14 | BuildConfig.VERSION_NAME, |
16 | BuildConfig.BUILD_TYPE) | 15 | BuildConfig.BUILD_TYPE) |
17 | 16 | ||
18 | fun androidVersion(r: Resources): String = r.getString( | 17 | fun androidVersion(): String = App.getResources().getString( |
19 | R.string.info_running_on_format, | 18 | R.string.info_running_on_format, |
20 | Build.VERSION.CODENAME, | 19 | Build.VERSION.CODENAME, |
21 | Build.VERSION.RELEASE) | 20 | Build.VERSION.RELEASE) |
22 | 21 | ||
23 | fun supportedABIs(r: Resources): String = r.getString( | 22 | fun supportedABIs(): String = App.getResources().getString( |
24 | R.string.info_supported_abis_format, | 23 | R.string.info_supported_abis_format, |
25 | Build.SUPPORTED_ABIS.joinToString(",")) | 24 | Build.SUPPORTED_ABIS.joinToString(",")) |
26 | 25 | ||
27 | fun all(r: Resources): String = listOf( | 26 | fun all(): String = listOf( |
28 | appVersion(r), | 27 | appVersion(), |
29 | androidVersion(r), | 28 | androidVersion(), |
30 | supportedABIs(r)).joinToString("\n") | 29 | supportedABIs()).joinToString("\n") |
31 | 30 | ||
32 | } | 31 | } |
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 { | |||
29 | return f | 29 | return f |
30 | } | 30 | } |
31 | 31 | ||
32 | fun confDir(ctx: Context): File = ctx.getDir(CONFDIR, Context.MODE_PRIVATE) | 32 | fun confDir(): File = App.getContext().getDir(CONFDIR, Context.MODE_PRIVATE) |
33 | fun confDir(ctx: Context, netName: String): File = File(confDir(ctx), netName) | 33 | fun confDir(netName: String): File = File(confDir(), netName) |
34 | fun logDir(ctx: Context): File = createDirIfNotExists(ctx.cacheDir, LOGDIR) | 34 | fun logDir(): File = createDirIfNotExists(App.getContext().cacheDir, LOGDIR) |
35 | fun pidDir(ctx: Context): File = createDirIfNotExists(ctx.cacheDir, PIDDIR) | 35 | fun pidDir(): File = createDirIfNotExists(App.getContext().cacheDir, PIDDIR) |
36 | fun logFile(ctx: Context, netName: String): File = File(logDir(ctx), String.format(LOGFILE_FORMAT, netName)) | 36 | fun logFile(netName: String): File = File(logDir(), String.format(LOGFILE_FORMAT, netName)) |
37 | fun pidFile(ctx: Context, netName: String): File = File(pidDir(ctx), String.format(PIDFILE_FORMAT, netName)) | 37 | fun pidFile(netName: String): File = File(pidDir(), String.format(PIDFILE_FORMAT, netName)) |
38 | fun netConfFile(ctx: Context, netName: String): File = File(confDir(ctx, netName), NET_CONF_FILE) | 38 | fun netConfFile(netName: String): File = File(confDir(netName), NET_CONF_FILE) |
39 | fun binDir(ctx: Context): File = File(ctx.applicationInfo.nativeLibraryDir) | 39 | fun binDir(): File = File(App.getContext().applicationInfo.nativeLibraryDir) |
40 | fun tincd(ctx: Context): File = File(binDir(ctx), TINCD_BIN) | 40 | fun tincd(): File = File(binDir(), TINCD_BIN) |
41 | fun tinc(ctx: Context): File = File(binDir(ctx), TINC_BIN) | 41 | fun tinc(): File = File(binDir(), TINC_BIN) |
42 | 42 | ||
43 | } | 43 | } |