Avoid null context in fragments.

GnuCash-Pocket · Jan 9, 2025 · 9274192 · 9274192
1 parent 2a25c2d
commit 9274192
Show file tree

Hide file tree

Showing 2 changed files with 171 additions and 151 deletions.
diff --git a/app/src/main/java/org/gnucash/android/app/MenuFragment.kt b/app/src/main/java/org/gnucash/android/app/MenuFragment.kt
@@ -12,17 +12,16 @@ open class MenuFragment : Fragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val activity = requireActivity()
-        if (activity is ComponentActivity) {
-            activity.addMenuProvider(object : MenuProvider {
-                override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
-                    menu.clear()
-                    onCreateOptionsMenu(menu, menuInflater)
-                }
+        activity.addMenuProvider(object : MenuProvider {
+            override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+                menu.clear()
+                onCreateOptionsMenu(menu, menuInflater)
+            }
 
-                override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
-                    return onOptionsItemSelected(menuItem)
-                }
-            })
-        }
+            override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+                if (context == null) return false
+                return onOptionsItemSelected(menuItem)
+            }
+        })
     }
 }