For #8054 - Focus should not crash when search engines are restored. (#…

…8059) (cherry picked from commit 63ba241) Co-authored-by: iorgamgabriel <[email protected]>
mozilla-mobile · Nov 21, 2022 · e4d102f · e4d102f
1 parent 75cba87
commit e4d102f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/src/main/java/org/mozilla/focus/search/RadioSearchEngineListPreference.kt b/app/src/main/java/org/mozilla/focus/search/RadioSearchEngineListPreference.kt
@@ -39,14 +39,14 @@ class RadioSearchEngineListPreference : SearchEngineListPreference, RadioGroup.O
     }
 
     override fun onCheckedChanged(group: RadioGroup, checkedId: Int) {
-        val selectedEngine = group.getChildAt(checkedId)
+        val selectedEngine = group.getChildAt(checkedId) ?: return
 
         // check if the corresponding button was pressed or a11y focused.
         val hasProperState = selectedEngine.isPressed || selectedEngine.isAccessibilityFocused
 
         /* onCheckedChanged is called intermittently before the search engine table is full, so we
            must check these conditions to prevent crashes and inconsistent states. */
-        if (group.childCount != searchEngines.count() || selectedEngine == null || !hasProperState) {
+        if (group.childCount != searchEngines.count() || !hasProperState) {
             return
         }