Convert preference stuff to getters

TacoTheDank · Nov 24, 2021 · 0c02c31 · 0c02c31
1 parent 60343b0
commit 0c02c31
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 45 deletions.
diff --git a/app/src/main/java/taco/scoop/core/receiver/BootReceiver.kt b/app/src/main/java/taco/scoop/core/receiver/BootReceiver.kt
@@ -13,7 +13,7 @@ class BootReceiver : BroadcastReceiver() {
         if (intent?.action != Intent.ACTION_BOOT_COMPLETED)
             return
 
-        if (PreferenceHelper.autostartOnBoot()) {
+        if (PreferenceHelper.autostartOnBoot) {
             context.initScoopService()
 
             Log.d("Scoop", "Started application on boot")

diff --git a/app/src/main/java/taco/scoop/core/receiver/CrashReceiver.kt b/app/src/main/java/taco/scoop/core/receiver/CrashReceiver.kt
@@ -35,7 +35,7 @@ class CrashReceiver : BroadcastReceiver() {
             return
 
         description = intent.getStringExtra(Intents.INTENT_DESCRIPTION)!!
-        if (description!!.startsWith(ThreadDeath::class.java.name) && ignoreThreadDeath())
+        if (description!!.startsWith(ThreadDeath::class.java.name) && ignoreThreadDeath)
             return
 
         packageName = intent.getStringExtra(Intents.INTENT_PACKAGE_NAME)
@@ -52,7 +52,7 @@ class CrashReceiver : BroadcastReceiver() {
             crash = intent.getParcelableExtra("crash")
         }
 
-        if (!showNotifications() or blacklistList.contains(packageName)) {
+        if (!showNotifications or blacklistList.contains(packageName)) {
             return
         }
 
@@ -80,7 +80,7 @@ class CrashReceiver : BroadcastReceiver() {
         }
 
         val notificationId = (time - bootTime).toInt()
-        if (showActionButtons()) {
+        if (showActionButtons) {
             builder.addActionButtons(context, notificationId)
         }
 
@@ -100,7 +100,7 @@ class CrashReceiver : BroadcastReceiver() {
     }
 
     private fun NotificationCompat.Builder.setNotificationStyle(): NotificationCompat.Builder {
-        return if (showStackTraceNotifications()) {
+        return if (showStackTraceNotifications) {
             val style = NotificationCompat.InboxStyle()
             val traces = stackTrace!!.split("\n".toRegex()).toTypedArray()
             var i = 0

diff --git a/app/src/main/java/taco/scoop/ui/activity/DetailActivity.kt b/app/src/main/java/taco/scoop/ui/activity/DetailActivity.kt
@@ -47,7 +47,7 @@ class DetailActivity : AppCompatActivity(), SearchView.OnQueryTextListener,
             TypedValue.COMPLEX_UNIT_PX, binding.detailCrashLogText.textSize
         )
 
-        binding.detailScrollView.setCropHorizontally(PreferenceHelper.autoWrap())
+        binding.detailScrollView.setCropHorizontally(PreferenceHelper.autoWrap)
     }
 
     private fun highlightText(text: String?) {

diff --git a/app/src/main/java/taco/scoop/ui/activity/MainActivity.kt b/app/src/main/java/taco/scoop/ui/activity/MainActivity.kt
@@ -95,7 +95,7 @@ class MainActivity : AppCompatActivity(), CrashAdapter.Listener, SearchView.OnQu
             supportActionBar?.setDisplayHomeAsUpEnabled(true)
         }
 
-        mCombineApps = PreferenceHelper.combineSameApps()
+        mCombineApps = PreferenceHelper.combineSameApps
         mAdapter!!.setCombineSameApps(!mHasCrash && mCombineApps)
         binding.mainCrashView.setReverseOrder(mHasCrash || !mCombineApps)
 
@@ -128,7 +128,7 @@ class MainActivity : AppCompatActivity(), CrashAdapter.Listener, SearchView.OnQu
         super.onResume()
         // Cheap way to instantly apply changes
         mAdapter!!.setSearchPackageName(
-            this, PreferenceHelper.searchPackageName()
+            this, PreferenceHelper.searchPackageName
         )
         sVisible = true
         mHandler!!.post(mUpdateCheckerRunnable)
@@ -157,7 +157,7 @@ class MainActivity : AppCompatActivity(), CrashAdapter.Listener, SearchView.OnQu
     }
 
     private fun updateLocale() {
-        if (PreferenceHelper.forceEnglish()) {
+        if (PreferenceHelper.forceEnglish) {
             // TODO: Use ConfigurationCompat
             val config = resources.configuration
             config.locale = Locale.ENGLISH
@@ -198,8 +198,8 @@ class MainActivity : AppCompatActivity(), CrashAdapter.Listener, SearchView.OnQu
         updateViewStates(true)
         mLoader.loadData(
             this,
-            PreferenceHelper.combineSameStackTrace(),
-            PreferenceHelper.combineSameApps(),
+            PreferenceHelper.combineSameStackTrace,
+            PreferenceHelper.combineSameApps,
             PreferenceHelper.blacklistList
         )
     }

diff --git a/app/src/main/java/taco/scoop/util/PreferenceHelper.kt b/app/src/main/java/taco/scoop/util/PreferenceHelper.kt
@@ -25,54 +25,43 @@ object PreferenceHelper {
         return sharedPreferences.getBoolean(getKey(key), defValue)
     }
 
-    fun showNotifications(): Boolean {
-        return getSharedBoolean(R.string.prefKey_show_notification, true)
-    }
+    val showNotifications: Boolean
+        get() = getSharedBoolean(R.string.prefKey_show_notification, true)
 
-    fun showActionButtons(): Boolean {
-        return getSharedBoolean(R.string.prefKey_show_action_buttons, true)
-    }
+    val showActionButtons: Boolean
+        get() = getSharedBoolean(R.string.prefKey_show_action_buttons, true)
 
-    fun showStackTraceNotifications(): Boolean {
-        return getSharedBoolean(R.string.prefKey_show_stack_trace_notif, false)
-    }
+    val showStackTraceNotifications: Boolean
+        get() = getSharedBoolean(R.string.prefKey_show_stack_trace_notif, false)
 
-    fun combineSameApps(): Boolean {
-        return getSharedBoolean(R.string.prefKey_combine_same_apps, false)
-    }
+    val combineSameApps: Boolean
+        get() = getSharedBoolean(R.string.prefKey_combine_same_apps, false)
 
-    fun combineSameStackTrace(): Boolean {
-        return getSharedBoolean(R.string.prefKey_combine_same_stack_trace, true)
-    }
+    val combineSameStackTrace: Boolean
+        get() = getSharedBoolean(R.string.prefKey_combine_same_stack_trace, true)
 
-    fun searchPackageName(): Boolean {
-        return getSharedBoolean(R.string.prefKey_search_package_name, true)
-    }
+    val searchPackageName: Boolean
+        get() = getSharedBoolean(R.string.prefKey_search_package_name, true)
 
-    fun autoWrap(): Boolean {
-        return getSharedBoolean(R.string.prefKey_auto_wrap, false)
-    }
+    val autoWrap: Boolean
+        get() = getSharedBoolean(R.string.prefKey_auto_wrap, false)
 
-    fun autostartOnBoot(): Boolean {
-        return getSharedBoolean(R.string.prefKey_autostart_on_boot, false)
-    }
+    val autostartOnBoot: Boolean
+        get() = getSharedBoolean(R.string.prefKey_autostart_on_boot, false)
 
-    fun ignoreThreadDeath(): Boolean {
-        return getSharedBoolean(R.string.prefKey_ignore_threaddeath, true)
-    }
+    val ignoreThreadDeath: Boolean
+        get() = getSharedBoolean(R.string.prefKey_ignore_threaddeath, true)
 
-    fun forceEnglish(): Boolean {
-        return getSharedBoolean(R.string.prefKey_force_english, false)
-    }
+    val forceEnglish: Boolean
+        get() = getSharedBoolean(R.string.prefKey_force_english, false)
 
-    private fun getBlacklistedPackages(): String? {
-        return sharedPreferences.getString(
+    private val blacklistedPackages: String?
+        get() = sharedPreferences.getString(
             getKey(R.string.key_blacklisted_packages), ""
         )
-    }
 
     val blacklistList: List<String>
-        get() = listOf(*getBlacklistedPackages()?.split(",".toRegex())!!.toTypedArray())
+        get() = listOf(*blacklistedPackages?.split(",".toRegex())!!.toTypedArray())
 
     fun editBlacklistPackages(packages: ArrayList<String>) {
         sharedPreferences.edit {