diff options
author | pacien | 2018-02-16 18:42:02 +0100 |
---|---|---|
committer | pacien | 2018-02-16 18:42:02 +0100 |
commit | d360837d494a86930b8323a99691dc52925eb7ea (patch) | |
tree | 2fc1a8b1bf70d0fdbaa45a0185b0158f23a29a5d /app/src/main/java/org/pacien/tincapp/context | |
parent | 5a4f0f964e41847b10ed44ac1f5b2bbf060102c3 (diff) | |
download | tincapp-d360837d494a86930b8323a99691dc52925eb7ea.tar.gz |
Cosmetic
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/context')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/context/App.kt | 8 | ||||
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/context/AppInfo.kt | 2 | ||||
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/context/AppPaths.kt | 2 |
3 files changed, 1 insertions, 11 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 index 0a365d0..9fb910b 100644 --- a/app/src/main/java/org/pacien/tincapp/context/App.kt +++ b/app/src/main/java/org/pacien/tincapp/context/App.kt | |||
@@ -13,14 +13,12 @@ import org.pacien.tincapp.R | |||
13 | * @author pacien | 13 | * @author pacien |
14 | */ | 14 | */ |
15 | class App : Application() { | 15 | class App : Application() { |
16 | |||
17 | override fun onCreate() { | 16 | override fun onCreate() { |
18 | super.onCreate() | 17 | super.onCreate() |
19 | appContext = applicationContext | 18 | appContext = applicationContext |
20 | } | 19 | } |
21 | 20 | ||
22 | companion object { | 21 | companion object { |
23 | |||
24 | private var appContext: Context? = null | 22 | private var appContext: Context? = null |
25 | 23 | ||
26 | fun getContext() = appContext!! | 24 | fun getContext() = appContext!! |
@@ -30,14 +28,10 @@ class App : Application() { | |||
30 | AlertDialog.Builder(getContext(), R.style.Theme_AppCompat_Dialog) | 28 | AlertDialog.Builder(getContext(), R.style.Theme_AppCompat_Dialog) |
31 | .setTitle(title).setMessage(msg) | 29 | .setTitle(title).setMessage(msg) |
32 | .apply { if (manualLink != null) setNeutralButton(R.string.action_open_manual) { _, _ -> openURL(manualLink) } } | 30 | .apply { if (manualLink != null) setNeutralButton(R.string.action_open_manual) { _, _ -> openURL(manualLink) } } |
33 | .setPositiveButton(R.string.action_close, dismissAction) | 31 | .setPositiveButton(R.string.action_close, { _, _ -> Unit }) |
34 | .create().apply { window.setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR) }.show() | 32 | .create().apply { window.setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR) }.show() |
35 | 33 | ||
36 | fun openURL(url: String) = | 34 | fun openURL(url: String) = |
37 | appContext?.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) | 35 | appContext?.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) |
38 | |||
39 | val dismissAction = { _: Any, _: Any -> /* nop */ } | ||
40 | |||
41 | } | 36 | } |
42 | |||
43 | } | 37 | } |
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 0f61185..2feca05 100644 --- a/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt +++ b/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt | |||
@@ -8,7 +8,6 @@ import org.pacien.tincapp.R | |||
8 | * @author pacien | 8 | * @author pacien |
9 | */ | 9 | */ |
10 | object AppInfo { | 10 | object AppInfo { |
11 | |||
12 | fun appVersion(): String = App.getResources().getString( | 11 | fun appVersion(): String = App.getResources().getString( |
13 | R.string.info_version_format, | 12 | R.string.info_version_format, |
14 | BuildConfig.VERSION_NAME, | 13 | BuildConfig.VERSION_NAME, |
@@ -27,5 +26,4 @@ object AppInfo { | |||
27 | appVersion(), | 26 | appVersion(), |
28 | androidVersion(), | 27 | androidVersion(), |
29 | supportedABIs()).joinToString("\n") | 28 | supportedABIs()).joinToString("\n") |
30 | |||
31 | } | 29 | } |
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 2d5e2e4..9315060 100644 --- a/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt +++ b/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt | |||
@@ -10,7 +10,6 @@ import java.io.FileNotFoundException | |||
10 | * @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. |
11 | */ | 11 | */ |
12 | object AppPaths { | 12 | object AppPaths { |
13 | |||
14 | private val TINCD_BIN = "libtincd.so" | 13 | private val TINCD_BIN = "libtincd.so" |
15 | private val TINC_BIN = "libtinc.so" | 14 | private val TINC_BIN = "libtinc.so" |
16 | 15 | ||
@@ -46,5 +45,4 @@ object AppPaths { | |||
46 | 45 | ||
47 | fun tincd() = File(binDir(), TINCD_BIN) | 46 | fun tincd() = File(binDir(), TINCD_BIN) |
48 | fun tinc() = File(binDir(), TINC_BIN) | 47 | fun tinc() = File(binDir(), TINC_BIN) |
49 | |||
50 | } | 48 | } |