X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FBookmarksActivity.java;h=905a98d004df241e1e8c129df5bf7ef296ce0d93;hb=c45c0fa64109c47bdc35328d0e31a65c685bdc22;hp=ef2bb4ed9ea19513bb17f78ea7efa0d46dfabcc1;hpb=38919c77d15eeacbee96ab337afc62b30ddc74ca;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java index ef2bb4ed..905a98d0 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java @@ -71,15 +71,13 @@ import java.util.ArrayList; public class BookmarksActivity extends AppCompatActivity implements CreateBookmarkDialog.CreateBookmarkListener, CreateBookmarkFolderDialog.CreateBookmarkFolderListener, EditBookmarkDialog.EditBookmarkListener, EditBookmarkFolderDialog.EditBookmarkFolderListener, MoveToFolderDialog.MoveToFolderListener { - // `currentFolder` is public static so it can be accessed from `BookmarksDatabaseViewActivity`. + // Declare the public static variables, which are accessed from the bookmarks database view activity. public static String currentFolder; - - // `restartFromBookmarksDatabaseViewActivity` is public static so it can be accessed from `BookmarksDatabaseViewActivity`. It is also used in `onRestart()`. public static boolean restartFromBookmarksDatabaseViewActivity; - // Define the saved instance state constants. private final String CHECKED_BOOKMARKS_ARRAY_LIST = "checked_bookmarks_array_list"; + private final String CURRENT_FOLDER = "current_folder"; // Define the class menu items. private MenuItem moveBookmarkUpMenuItem; @@ -132,9 +130,6 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); } - // Set the theme. - setTheme(R.style.PrivacyBrowser); - // Run the default commands. super.onCreate(savedInstanceState); @@ -192,9 +187,6 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma // Initialize the database helper. bookmarksDatabaseHelper = new BookmarksDatabaseHelper(this); - // Load the home folder. - loadFolder(); - // Set a listener so that tapping a list item loads the URL or folder. bookmarksListView.setOnItemClickListener((parent, view, position, id) -> { // Convert the id from long to int to match the format of the bookmarks database. @@ -617,6 +609,9 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma // Restore the state if the app has been restarted. if (savedInstanceState != null) { + // Restore the current folder. + currentFolder = savedInstanceState.getString(CURRENT_FOLDER); + // Update the bookmarks list view after it has loaded. bookmarksListView.post(() -> { // Get the checked bookmarks array list. @@ -630,6 +625,9 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma } }); } + + // Load the home folder. + loadFolder(); } @Override @@ -667,7 +665,8 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma } } - // Store the checked items array list in the saved instance state. + // Store the variables in the saved instance state. + savedInstanceState.putString(CURRENT_FOLDER, currentFolder); savedInstanceState.putIntegerArrayList(CHECKED_BOOKMARKS_ARRAY_LIST, checkedBookmarksArrayList); }