Fix a crash on new installs. https://redmine.stoutner.com/issues/925

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / activities / BookmarksDatabaseViewActivity.java

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java
index dbfda387903de7d0fc0a9c40b42467fb8a16249b..0560c017a0a78deb65ceba3e9bc952103b1bc7f5 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2016-2022 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -34,7 +34,6 @@ import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.util.SparseBooleanArray;
 import android.view.ActionMode;
 import android.view.Menu;
@@ -53,6 +52,7 @@ import android.widget.ResourceCursorAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -60,6 +60,7 @@ import androidx.appcompat.widget.Toolbar;  // The AndroidX toolbar must be used
 import androidx.core.content.ContextCompat;
 import androidx.cursoradapter.widget.CursorAdapter;
 import androidx.fragment.app.DialogFragment;  // The AndroidX dialog fragment must be used or an error is produced on API <=22.
+import androidx.preference.PreferenceManager;
 
 import com.google.android.material.snackbar.Snackbar;
 
@@ -107,9 +108,6 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
         }
 
-        // Set the activity theme.
-        setTheme(R.style.PrivacyBrowser);
-
         // Run the default commands.
         super.onCreate(savedInstanceState);
 
@@ -153,6 +151,18 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements
         actionBar.setCustomView(R.layout.spinner);
         actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM | ActionBar.DISPLAY_HOME_AS_UP);
 
+        // Control what the system back command does.
+        OnBackPressedCallback onBackPressedCallback = new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                // Prepare to finish the activity.
+                prepareFinish();
+            }
+        };
+
+        // Register the on back pressed callback.
+        getOnBackPressedDispatcher().addCallback(this, onBackPressedCallback);
+
         // Initialize the database handler.
         bookmarksDatabaseHelper = new BookmarksDatabaseHelper(this);
 
@@ -588,7 +598,7 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements
 
                                     // Close the activity if back has been pressed.
                                     if (closeActivityAfterDismissingSnackbar) {
-                                        onBackPressed();
+                                        finish();
                                     }
                                 }
                             });
@@ -632,8 +642,8 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements
 
         // Run the command that corresponds to the selected menu item.
         if (menuItemId == android.R.id.home) {  // Go Home.  The home arrow is identified as `android.R.id.home`, not just `R.id.home`.
-            // Exit the activity.
-            onBackPressed();
+            // Prepare to finish the activity.
+            prepareFinish();
         } else if (menuItemId == R.id.sort) {  // Toggle the sort mode.
             // Update the sort by display order tracker.
             sortByDisplayOrder = !sortByDisplayOrder;
@@ -675,8 +685,7 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements
         savedInstanceState.putBoolean(SORT_BY_DISPLAY_ORDER, sortByDisplayOrder);
     }
 
-    @Override
-    public void onBackPressed() {
+    private void prepareFinish() {
         // Check to see if a snackbar is currently displayed.  If so, it must be closed before existing so that a pending delete is completed before reloading the list view in the bookmarks activity.
         if ((bookmarksDeletedSnackbar != null) && bookmarksDeletedSnackbar.isShown()) { // Close the bookmarks deleted snackbar before going home.
             // Set the close flag.
@@ -698,7 +707,7 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements
             BookmarksActivity.restartFromBookmarksDatabaseViewActivity = true;
 
             // Exit the bookmarks database view activity.
-            super.onBackPressed();
+            finish();
         }
     }
 
@@ -918,4 +927,4 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements
         // Run the default commands.
         super.onDestroy();
     }
-}
\ No newline at end of file
+}