X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FEditBookmarkFolderDialog.java;h=e854a065808eeb8241715bf0aa7a324c43f9ddd6;hp=8f41bfc7cb4eb60db318fd395e918b1cf74e3b61;hb=572449f6c66adfc1a3d88e761cb87581a7961df3;hpb=0a5d2eabceeafb49a957598538aa74d4f11dfce0

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.java
index 8f41bfc7..e854a065 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2018 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -47,25 +47,20 @@ import com.stoutner.privacybrowser.activities.MainWebViewActivity;
 import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper;
 
 public class EditBookmarkFolderDialog extends AppCompatDialogFragment {
+    // Instantiate the class variable.
+    private EditBookmarkFolderListener editBookmarkFolderListener;
+
     // The public interface is used to send information back to the parent activity.
     public interface EditBookmarkFolderListener {
         void onSaveBookmarkFolder(AppCompatDialogFragment dialogFragment, int selectedFolderDatabaseId);
     }
 
-    // Instantiate the class variables.
-    private EditBookmarkFolderListener editBookmarkFolderListener;
-    private int selectedFolderDatabaseId;
-
     public void onAttach(Context context) {
         // Run the default commands.
         super.onAttach(context);
 
-        // Get a handle for `EditFolderListener` from `parentActivity`.
-        try {
-            editBookmarkFolderListener = (EditBookmarkFolderListener) context;
-        } catch(ClassCastException exception) {
-            throw new ClassCastException(context.toString() + " must implement EditBookmarkFolderListener.");
-        }
+        // Get a handle for `EditFolderListener` from the launching context.
+        editBookmarkFolderListener = (EditBookmarkFolderListener) context;
     }
 
     // Store the database ID in the arguments bundle.
@@ -84,28 +79,22 @@ public class EditBookmarkFolderDialog extends AppCompatDialogFragment {
         return editBookmarkFolderDialog;
     }
 
+    // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
+    @SuppressLint("InflateParams")
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        // Run the default commands.
-        super.onCreate(savedInstanceState);
-
+    @NonNull
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
         // Remove the incorrect lint warning that `getInt()` might be null.
         assert getArguments() != null;
 
         // Store the folder database ID in the class variable.
-        selectedFolderDatabaseId = getArguments().getInt("Database ID");
-    }
+        int selectedFolderDatabaseId = getArguments().getInt("Database ID");
 
-    // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
-    @SuppressLint("InflateParams")
-    @Override
-    @NonNull
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
         // Initialize the database helper.  The two `nulls` do not specify the database name or a `CursorFactory`.  The `0` specifies a database version, but that is ignored and set instead using a constant in `BookmarksDatabaseHelper`.
         final BookmarksDatabaseHelper bookmarksDatabaseHelper = new BookmarksDatabaseHelper(getContext(), null, null, 0);
 
         // Get a `Cursor` with the selected folder and move it to the first position.
-        Cursor folderCursor = bookmarksDatabaseHelper.getBookmarkCursor(selectedFolderDatabaseId);
+        Cursor folderCursor = bookmarksDatabaseHelper.getBookmark(selectedFolderDatabaseId);
         folderCursor.moveToFirst();
 
         // Use an alert dialog builder to create the alert dialog.
@@ -200,7 +189,7 @@ public class EditBookmarkFolderDialog extends AppCompatDialogFragment {
                 String newFolderName = s.toString();
 
                 // Get a cursor for the new folder name if it exists.
-                Cursor folderExistsCursor = bookmarksDatabaseHelper.getFolderCursor(newFolderName);
+                Cursor folderExistsCursor = bookmarksDatabaseHelper.getFolder(newFolderName);
 
                 // Is the new folder name empty?
                 boolean folderNameNotEmpty = !newFolderName.isEmpty();
@@ -225,7 +214,7 @@ public class EditBookmarkFolderDialog extends AppCompatDialogFragment {
             String newFolderName = folderNameEditText.getText().toString();
 
             // Get a cursor for the new folder name if it exists.
-            Cursor folderExistsCursor = bookmarksDatabaseHelper.getFolderCursor(newFolderName);
+            Cursor folderExistsCursor = bookmarksDatabaseHelper.getFolder(newFolderName);
 
             // Is the new folder name empty?
             boolean folderNameEmpty = newFolderName.isEmpty();