PR feedback

Author: ThomasSession

app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.kt

@@ -52,12 +52,12 @@ class NotificationsPreferenceFragment : CorrectedPreferenceFragment() {
     @Inject
     lateinit var prefs: TextSecurePreferences
 
-    var showWhitelistEnableDialog by mutableStateOf(false)
-    var showWhitelistDisableDialog by mutableStateOf(false)
+    private var showWhitelistEnableDialog by mutableStateOf(false)
+    private var showWhitelistDisableDialog by mutableStateOf(false)
 
-    var whiteListControl: SwitchPreferenceCompat? = null
+    private var whiteListControl: SwitchPreferenceCompat? = null
 
-    private val composeView by lazy { ComposeView(requireContext()) }
+    private var composeView: ComposeView? = null
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -82,6 +82,7 @@ class NotificationsPreferenceFragment : CorrectedPreferenceFragment() {
             )
         )
 
+        composeView = ComposeView(requireContext())
         wrapper.addView(
             composeView,
             FrameLayout.LayoutParams(
@@ -98,7 +99,7 @@ class NotificationsPreferenceFragment : CorrectedPreferenceFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         //set up compose content
-        composeView.apply {
+        composeView?.apply {
             setViewCompositionStrategy(
                 ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed
             )

app/src/main/java/org/thoughtcrime/securesms/ui/Util.kt

@@ -107,7 +107,16 @@ fun Activity.requestDozeWhitelist() {
         startActivity(intent) // shows the system dialog for this specific app
     } catch (_: ActivityNotFoundException) {
         // Fallback to the general settings list
-        startActivity(Intent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS))
+        try {
+            val intent = Intent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS)
+            startActivity(intent)
+        } catch (_: ActivityNotFoundException) {
+            try {
+                startActivity(Intent(Settings.ACTION_SETTINGS))
+            } catch (_: ActivityNotFoundException) {
+                Toast.makeText(this, R.string.errorGeneric, Toast.LENGTH_LONG).show()
+            }
+        }
     }
 }