X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FBookmarksDatabaseViewActivity.java;h=d8a58972990dfcfa6169353f2942b56f10c3eeaf;hb=560d0030d352407816b4167025a89e54808b29e9;hp=006af07a94c36b590ce86ee7b72d265774f3e5f0;hpb=012e5595c82d6e8d0b8a46f1ef18a02a56341182;p=PrivacyBrowserAndroid.git 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 006af07a..d8a58972 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java @@ -60,10 +60,10 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements private static final int ALL_FOLDERS_DATABASE_ID = -2; private static final int HOME_FOLDER_DATABASE_ID = -1; - // `bookmarksDatabaseHelper` is used in `onCreate()` and `updateBookmarksListView()`. + // `bookmarksDatabaseHelper` is used in `onCreate()`, `updateBookmarksListView()`, and `onDestroy()`. private BookmarksDatabaseHelper bookmarksDatabaseHelper; - // `bookmarksCursor` is used in `onCreate()`, `updateBookmarksListView()`, `onSaveBookmark()`, and `onSaveBookmarkFolder()`. + // `bookmarksCursor` is used in `onCreate()`, `updateBookmarksListView()`, `onSaveBookmark()`, `onSaveBookmarkFolder()`, and `onDestroy()`. private Cursor bookmarksCursor; // `bookmarksCursorAdapter` is used in `onCreate()`, `onSaveBookmark()`, `onSaveBookmarkFolder()`. @@ -109,7 +109,7 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements assert appBar != null; // Display the spinner and the back arrow in the app bar. - appBar.setCustomView(R.layout.bookmarks_databaseview_spinner); + appBar.setCustomView(R.layout.spinner); appBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM | ActionBar.DISPLAY_HOME_AS_UP); // Initialize the database handler. `this` specifies the context. The two `null`s do not specify the database name or a `CursorFactory`. The `0` is to specify a database version, but that is set instead using a constant in `BookmarksDatabaseHelper`. @@ -128,7 +128,7 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements MergeCursor foldersMergeCursor = new MergeCursor(new Cursor[]{matrixCursor, foldersCursor}); // Create a resource cursor adapter for the spinner. - ResourceCursorAdapter foldersCursorAdapter = new ResourceCursorAdapter(this, R.layout.bookmarks_databaseview_spinner_item, foldersMergeCursor, 0) { + ResourceCursorAdapter foldersCursorAdapter = new ResourceCursorAdapter(this, R.layout.appbar_spinner_item, foldersMergeCursor, 0) { @Override public void bindView(View view, Context context, Cursor cursor) { // Get a handle for the spinner item text view. @@ -140,10 +140,10 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements }; // Set the resource cursor adapter drop drown view resource. - foldersCursorAdapter.setDropDownViewResource(R.layout.bookmarks_databaseview_spinner_dropdown_item); + foldersCursorAdapter.setDropDownViewResource(R.layout.appbar_spinner_dropdown_item); // Get a handle for the folder spinner and set the adapter. - Spinner folderSpinner = findViewById(R.id.bookmarks_databaseview_spinner); + Spinner folderSpinner = findViewById(R.id.spinner); folderSpinner.setAdapter(foldersCursorAdapter); // Handle clicks on the spinner dropdown. @@ -435,4 +435,14 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements // Update the `ListView`. bookmarksCursorAdapter.changeCursor(bookmarksCursor); } + + @Override + public void onDestroy() { + // Close the bookmarks cursor and database. + bookmarksCursor.close(); + bookmarksDatabaseHelper.close(); + + // Run the default commands. + super.onDestroy(); + } } \ No newline at end of file