optimise and refactor based on cr

Author: fpetrovski

app/src/main/kotlin/io/homeassistant/companion/android/settings/SettingsFragment.kt

@@ -360,23 +360,7 @@ class SettingsFragment(
             }
         }
 
-        findPreference<SwitchPreference>("enable_ha_launcher")?.let { switchPreference ->
-            switchPreference.setOnPreferenceClickListener {
-                findPreference<Preference>("set_launcher_app")?.isVisible = switchPreference.isChecked
-                true
-            }
-        }
-
-        findPreference<Preference>("set_launcher_app")?.let {
-            it.isVisible = findPreference<SwitchPreference>("enable_ha_launcher")?.isChecked ?: false
-            it.summary = getString(commonR.string.default_launcher_prompt_def, getDefaultLauncherInfo())
-            it.setOnPreferenceClickListener {
-                val intent = Intent(Settings.ACTION_HOME_SETTINGS)
-                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                startActivity(intent)
-                true
-            }
-        }
+        setupLauncherPrefs()
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -576,6 +560,28 @@ class SettingsFragment(
         }
     }
 
+    private fun setupLauncherPrefs() {
+        val launcherSwitchPref = findPreference<SwitchPreference>("enable_ha_launcher")
+        val launcherPref = findPreference<Preference>("set_launcher_app")
+
+        launcherSwitchPref?.setOnPreferenceClickListener {
+            launcherPref?.isVisible = launcherSwitchPref.isChecked
+            true
+        }
+
+        launcherPref?.apply {
+            isVisible = launcherSwitchPref?.isChecked ?: false
+            summary = getString(commonR.string.default_launcher_prompt_def, getDefaultLauncherInfo())
+            setOnPreferenceClickListener {
+                startActivity(
+                    Intent(Settings.ACTION_HOME_SETTINGS)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                )
+                true
+            }
+        }
+    }
+
     override fun getPackageManager(): PackageManager? = context?.packageManager
 
     private fun getDefaultLauncherInfo(): String {

app/src/main/kotlin/io/homeassistant/companion/android/settings/SettingsPresenterImpl.kt

@@ -83,7 +83,10 @@ class SettingsPresenterImpl @Inject constructor(
                 val componentSetting = view.getPackageManager()?.getComponentEnabledSetting(voiceCommandAppComponent)
                 componentSetting != null && componentSetting != PackageManager.COMPONENT_ENABLED_STATE_DISABLED
             }
-            "enable_ha_launcher" -> prefsRepository.isLauncherCapabilityEnabled()
+            "enable_ha_launcher" -> {
+                val componentSetting = view.getPackageManager()?.getComponentEnabledSetting(launcherAliasComponent)
+                componentSetting != null && componentSetting != PackageManager.COMPONENT_ENABLED_STATE_DISABLED
+            }
             else -> throw IllegalArgumentException("No boolean found by this key: $key")
         }
     }
@@ -104,7 +107,6 @@ class SettingsPresenterImpl @Inject constructor(
                         PackageManager.DONT_KILL_APP,
                     )
                 "enable_ha_launcher" -> {
-                    prefsRepository.setLauncherCapabilityEnabled(value)
                     enableLauncherMode(value)
                 }
                 else -> throw IllegalArgumentException("No boolean found by this key: $key")
@@ -310,7 +312,7 @@ class SettingsPresenterImpl @Inject constructor(
         view.getPackageManager()?.setComponentEnabledSetting(
             launcherAliasComponent,
             if (enable) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-            PackageManager.DONT_KILL_APP
+            if (enable) PackageManager.DONT_KILL_APP else 0
         )
     }
 }

common/src/main/kotlin/io/homeassistant/companion/android/common/data/prefs/PrefsRepository.kt

@@ -95,10 +95,6 @@ interface PrefsRepository {
 
     suspend fun addImprovPermissionDisplayedCount()
 
-    suspend fun isLauncherCapabilityEnabled(): Boolean
-
-    suspend fun setLauncherCapabilityEnabled(enabled: Boolean)
-
     /** Clean up any app-level preferences that might reference servers */
     suspend fun removeServer(serverId: Int)
 }

common/src/main/kotlin/io/homeassistant/companion/android/common/data/prefs/PrefsRepositoryImpl.kt

@@ -38,7 +38,6 @@ class PrefsRepositoryImpl @Inject constructor(
         private const val PREF_AUTO_FAVORITES = "auto_favorites"
         private const val PREF_LOCATION_HISTORY_DISABLED = "location_history"
         private const val PREF_IMPROV_PERMISSION_DISPLAYED = "improv_permission_displayed"
-        private const val PREF_LAUNCHER_CAPABILITY_ENABLED = "launcher_capability_enabled"
     }
 
     init {
@@ -261,14 +260,6 @@ class PrefsRepositoryImpl @Inject constructor(
         localStorage.putInt(PREF_IMPROV_PERMISSION_DISPLAYED, getImprovPermissionDisplayedCount() + 1)
     }
 
-    override suspend fun isLauncherCapabilityEnabled(): Boolean {
-        return localStorage.getBoolean(PREF_LAUNCHER_CAPABILITY_ENABLED)
-    }
-
-    override suspend fun setLauncherCapabilityEnabled(enabled: Boolean) {
-        localStorage.putBoolean(PREF_LAUNCHER_CAPABILITY_ENABLED, enabled)
-    }
-
     override suspend fun removeServer(serverId: Int) {
         val controlsAuthEntities = getControlsAuthEntities().filter { it.split(".")[0].toIntOrNull() != serverId }
         setControlsAuthEntities(controlsAuthEntities)