[Refactor] Fix NPE related to ViewModels

Signed-off-by: Muntashir Al-Islam <[email protected]>
MuntashirAkon · Oct 2, 2023 · c73f40c · c73f40c
1 parent d1830bb
commit c73f40c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/BaseActivity.java b/app/src/main/java/io/github/muntashirakon/AppManager/BaseActivity.java
@@ -235,7 +235,9 @@ private void handleMigrationAndModeOfOp() {
         // Authentication was successful
         Log.d(TAG, "Authenticated");
         // Set mode of operation
-        Objects.requireNonNull(mViewModel).setModeOfOps();
+        if (mViewModel != null) {
+            mViewModel.setModeOfOps();
+        }
     }
 
     private void initPermissionChecks() {

diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/main/MainActivity.java b/app/src/main/java/io/github/muntashirakon/AppManager/main/MainActivity.java
@@ -118,6 +118,10 @@ public class MainActivity extends BaseActivity implements AdvancedSearchView.OnQ
                     // Back button pressed.
                     return;
                 }
+                if (mModel == null) {
+                    // Invalid state
+                    return;
+                }
                 RulesTypeSelectionDialogFragment dialogFragment = new RulesTypeSelectionDialogFragment();
                 Bundle args = new Bundle();
                 args.putInt(RulesTypeSelectionDialogFragment.ARG_MODE, RulesTypeSelectionDialogFragment.MODE_EXPORT);

diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/main/SplashActivity.java b/app/src/main/java/io/github/muntashirakon/AppManager/main/SplashActivity.java
@@ -173,6 +173,8 @@ private void handleMigrationAndModeOfOp() {
             mStateNameView.setText(R.string.initializing);
         }
         // Set mode of operation
-        mViewModel.setModeOfOps();
+        if (mViewModel != null) {
+            mViewModel.setModeOfOps();
+        }
     }
 }