Remove the third-party cookies icon from the list of additional icons to display...

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

diff --git a/app/src/main/java/com/stoutner/privacybrowser/EditBookmarkFolder.java b/app/src/main/java/com/stoutner/privacybrowser/EditBookmarkFolder.java
index c27b963dc3f7436ed53cc8b5457fe34a1aa41faf..70fb16e711f08bf84de58945956b83e807ed5001 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/EditBookmarkFolder.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/EditBookmarkFolder.java
@@ -38,8 +38,6 @@ import android.widget.ImageView;
 public class EditBookmarkFolder extends DialogFragment {
     // The public interface is used to send information back to the parent activity.
     public interface EditBookmarkFolderListener {
-        void onCancelEditBookmarkFolder(DialogFragment dialogFragment);
-
         void onSaveEditBookmarkFolder(DialogFragment dialogFragment);
     }
 
@@ -77,8 +75,7 @@ public class EditBookmarkFolder extends DialogFragment {
         dialogBuilder.setNegativeButton(R.string.cancel, new Dialog.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                // Return the `DialogFragment` to the parent activity on cancel.
-                editBookmarkFolderListener.onCancelEditBookmarkFolder(EditBookmarkFolder.this);
+                // Do nothing.  The `AlertDialog` will close automatically.
             }
         });
 
@@ -111,9 +108,9 @@ public class EditBookmarkFolder extends DialogFragment {
         currentIconImageView.setImageBitmap(currentIconBitmap);
 
         // Get a `Bitmap` of the favorite icon from `MainWebViewActivity` and display it in `edit_folder_web_page_favorite_icon`.
-        ImageView webPageFavoriteIcon = (ImageView) alertDialog.findViewById(R.id.edit_folder_web_page_favorite_icon);
-        assert webPageFavoriteIcon != null;  // Remove the warning below that `webPageFavoriteIcon` might be null.
-        webPageFavoriteIcon.setImageBitmap(MainWebViewActivity.favoriteIcon);
+        ImageView webPageFavoriteIconImageView = (ImageView) alertDialog.findViewById(R.id.edit_folder_web_page_favorite_icon);
+        assert webPageFavoriteIconImageView != null;  // Remove the warning below that `webPageFavoriteIcon` might be null.
+        webPageFavoriteIconImageView.setImageBitmap(MainWebViewActivity.favoriteIcon);
 
         // Load the text for `edit_folder_name_edittext`.
         EditText folderNameEditText = (EditText) alertDialog.findViewById(R.id.edit_folder_name_edittext);