Uplift of #17916 (squashed) to beta

brave · Apr 5, 2023 · cfb6c8a · cfb6c8a
1 parent c4f6256
commit cfb6c8a
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/...oid/java/org/chromium/chrome/browser/set_default_browser/BraveSetDefaultBrowserUtils.java b/...oid/java/org/chromium/chrome/browser/set_default_browser/BraveSetDefaultBrowserUtils.java
@@ -25,6 +25,7 @@
 
 import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.ContextUtils;
+import org.chromium.base.Log;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
@@ -33,6 +34,7 @@
 import org.chromium.ui.widget.Toast;
 
 public class BraveSetDefaultBrowserUtils {
+    private static final String TAG = "BSDBrowserUtils";
     public static final String ANDROID_SETUPWIZARD_PACKAGE_NAME = "com.google.android.setupwizard";
     public static final String ANDROID_PACKAGE_NAME = "android";
     public static final String BRAVE_BLOG_URL = "https://brave.com/privacy-features/";
@@ -98,19 +100,25 @@ public static void showBraveSetDefaultBrowserDialog(
         if (!isBottomSheetVisible) {
             isBottomSheetVisible = true;
 
+            try {
+                SetDefaultBrowserBottomSheetFragment bottomSheetDialog =
+                        SetDefaultBrowserBottomSheetFragment.newInstance(isFromMenu);
+
+                bottomSheetDialog.show(activity.getSupportFragmentManager(),
+                        "SetDefaultBrowserBottomSheetFragment");
+            } catch (IllegalStateException e) {
+                // That exception could be thrown when Activity is not in the foreground.
+                Log.e(TAG, "showBraveSetDefaultBrowserDialog error: " + e.getMessage());
+                return;
+            }
+
             if (!isFromMenu) {
                 int braveDefaultModalCount = SharedPreferencesManager.getInstance().readInt(
                         BravePreferenceKeys.BRAVE_SET_DEFAULT_BOTTOM_SHEET_COUNT);
                 SharedPreferencesManager.getInstance().writeInt(
                         BravePreferenceKeys.BRAVE_SET_DEFAULT_BOTTOM_SHEET_COUNT,
                         braveDefaultModalCount + 1);
             }
-
-            SetDefaultBrowserBottomSheetFragment bottomSheetDialog =
-                    SetDefaultBrowserBottomSheetFragment.newInstance(isFromMenu);
-
-            bottomSheetDialog.show(
-                    activity.getSupportFragmentManager(), "SetDefaultBrowserBottomSheetFragment");
         }
     }