fix issue when action view crashed app on cold start

increment version
Aefyr · Aug 17, 2019 · d8f6a4c · d8f6a4c
1 parent 9eafda5
commit d8f6a4c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.aefyr.sai"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 30
-        versionName "2.0"
+        versionCode 31
+        versionName "2.1"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/com/aefyr/sai/ui/activities/MainActivity.java b/app/src/main/java/com/aefyr/sai/ui/activities/MainActivity.java
@@ -77,7 +77,7 @@ private void deliverActionViewUri(Uri uri) {
         }
         mBottomNavigationView.getMenu().getItem(0).setChecked(true);
         mFragmentNavigator.switchTo("installer");
-        getInstallerFragment().onActionView(uri);
+        getInstallerFragment().handleActionView(uri);
     }
 
     private void showMiuiWarning() {

diff --git a/app/src/main/java/com/aefyr/sai/ui/fragments/InstallerFragment.java b/app/src/main/java/com/aefyr/sai/ui/fragments/InstallerFragment.java
@@ -40,6 +40,8 @@ public class InstallerFragment extends SaiBaseFragment implements FilePickerDial
 
     private PreferencesHelper mHelper;
 
+    private Uri mPendingActionViewUri;
+
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
@@ -84,9 +86,19 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
         mButton.setOnClickListener((v) -> checkPermissionsAndPickFiles());
         findViewById(R.id.button_help).setOnClickListener((v) -> AlertsUtils.showAlert(this, R.string.help, R.string.installer_help));
+
+        if (mPendingActionViewUri != null) {
+            handleActionView(mPendingActionViewUri);
+            mPendingActionViewUri = null;
+        }
     }
 
-    public void onActionView(Uri uri) {
+    public void handleActionView(Uri uri) {
+        if (!isAdded()) {
+            mPendingActionViewUri = uri;
+            return;
+        }
+
         DialogFragment existingDialog = (DialogFragment) getChildFragmentManager().findFragmentByTag("installation_confirmation_dialog");
         if (existingDialog != null)
             existingDialog.dismiss();

diff --git a/app/src/main/java/com/aefyr/sai/utils/FragmentNavigator.java b/app/src/main/java/com/aefyr/sai/utils/FragmentNavigator.java
@@ -35,6 +35,9 @@ public FragmentNavigator(@Nullable Bundle savedInstanceState, FragmentManager fr
     }
 
     public void switchTo(String tag) {
+        if (mCurrentFragment != null && tag.equals(mCurrentFragment.getTag()))
+            return;
+
         ensureStateWasRestored();
 
         FragmentTransaction transaction = mFragmentManager.beginTransaction();