aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/org/pacien/tincapp/context
diff options
context:
space:
mode:
authorpacien2018-08-05 22:12:46 +0200
committerpacien2018-08-05 22:12:46 +0200
commit9012ef92ed810f4a08b5f01cd2c18430a277eacf (patch)
tree7e2dc8f9b61698e895fab07bc524575af5ec484b /app/src/main/java/org/pacien/tincapp/context
parenta9d1ac81374119e33871484c8749a94d11a71cae (diff)
downloadtincapp-9012ef92ed810f4a08b5f01cd2c18430a277eacf.tar.gz
Code style
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/context')
-rw-r--r--app/src/main/java/org/pacien/tincapp/context/App.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/context/AppInfo.kt6
-rw-r--r--app/src/main/java/org/pacien/tincapp/context/AppPaths.kt8
3 files changed, 8 insertions, 8 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 89d1c73..2d9151e 100644
--- a/app/src/main/java/org/pacien/tincapp/context/App.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/App.kt
@@ -66,7 +66,7 @@ class App : Application() {
66 AlertDialog.Builder(getContext(), R.style.Theme_AppCompat_Dialog) 66 AlertDialog.Builder(getContext(), R.style.Theme_AppCompat_Dialog)
67 .setTitle(title).setMessage(msg) 67 .setTitle(title).setMessage(msg)
68 .apply { if (manualLink != null) setNeutralButton(R.string.action_open_manual) { _, _ -> openURL(manualLink) } } 68 .apply { if (manualLink != null) setNeutralButton(R.string.action_open_manual) { _, _ -> openURL(manualLink) } }
69 .setPositiveButton(R.string.action_close, { _, _ -> Unit }) 69 .setPositiveButton(R.string.action_close) { _, _ -> Unit }
70 .create().apply { window.setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR) }.show() 70 .create().apply { window.setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR) }.show()
71 } 71 }
72 72
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 a7f5439..76da98f 100644
--- a/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
@@ -26,17 +26,17 @@ import org.pacien.tincapp.R
26 * @author pacien 26 * @author pacien
27 */ 27 */
28object AppInfo { 28object AppInfo {
29 fun appVersion(): String = App.getResources().getString( 29 private fun appVersion(): String = App.getResources().getString(
30 R.string.info_version_format, 30 R.string.info_version_format,
31 BuildConfig.VERSION_NAME, 31 BuildConfig.VERSION_NAME,
32 BuildConfig.BUILD_TYPE) 32 BuildConfig.BUILD_TYPE)
33 33
34 fun androidVersion(): String = App.getResources().getString( 34 private fun androidVersion(): String = App.getResources().getString(
35 R.string.info_running_on_format, 35 R.string.info_running_on_format,
36 Build.VERSION.CODENAME, 36 Build.VERSION.CODENAME,
37 Build.VERSION.RELEASE) 37 Build.VERSION.RELEASE)
38 38
39 fun supportedABIs(): String = App.getResources().getString( 39 private fun supportedABIs(): String = App.getResources().getString(
40 R.string.info_supported_abis_format, 40 R.string.info_supported_abis_format,
41 Build.SUPPORTED_ABIS.joinToString(",")) 41 Build.SUPPORTED_ABIS.joinToString(","))
42 42
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 ca9e03b..9ec4b69 100644
--- a/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
@@ -46,10 +46,10 @@ object AppPaths {
46 fun storageAvailable() = 46 fun storageAvailable() =
47 Environment.getExternalStorageState().let { it == Environment.MEDIA_MOUNTED && it != Environment.MEDIA_MOUNTED_READ_ONLY } 47 Environment.getExternalStorageState().let { it == Environment.MEDIA_MOUNTED && it != Environment.MEDIA_MOUNTED_READ_ONLY }
48 48
49 fun internalCacheDir() = App.getContext().cacheDir 49 private fun internalCacheDir() = App.getContext().cacheDir!!
50 fun cacheDir() = App.getContext().externalCacheDir 50 fun cacheDir() = App.getContext().externalCacheDir!!
51 fun confDir() = App.getContext().getExternalFilesDir(null) 51 fun confDir() = App.getContext().getExternalFilesDir(null)!!
52 fun binDir() = File(App.getContext().applicationInfo.nativeLibraryDir) 52 private fun binDir() = File(App.getContext().applicationInfo.nativeLibraryDir)
53 53
54 fun confDir(netName: String) = File(confDir(), netName) 54 fun confDir(netName: String) = File(confDir(), netName)
55 fun hostsDir(netName: String) = File(confDir(netName), NET_HOSTS_DIR) 55 fun hostsDir(netName: String) = File(confDir(netName), NET_HOSTS_DIR)