X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FMoveToFolder.java;h=60f7707f81d4b9b47c49abfbfcf517af60b778dc;hb=1bd5ba3b9f91e69517fa8a39665256f0badc408b;hp=da2f534d507942942a3b09ca4387d0caca7bc1a2;hpb=bc6574b86391ed9c731835c18de7bd0a10de19f8;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/MoveToFolder.java b/app/src/main/java/com/stoutner/privacybrowser/MoveToFolder.java
index da2f534d..60f7707f 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/MoveToFolder.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/MoveToFolder.java
@@ -21,7 +21,6 @@ package com.stoutner.privacybrowser;
 
 import android.annotation.SuppressLint;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.database.Cursor;
@@ -33,9 +32,12 @@ import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 // If we don't use `android.support.v7.app.AlertDialog` instead of `android.app.AlertDialog` then the dialog will be covered by the keyboard.
 import android.support.v4.content.ContextCompat;
+// We have to use `AppCompatDialogFragment` instead of `DialogFragment` or an error is produced on API <=22.
 import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatDialogFragment;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CursorAdapter;
@@ -45,12 +47,10 @@ import android.widget.TextView;
 
 import java.io.ByteArrayOutputStream;
 
-public class MoveToFolder extends DialogFragment {
+public class MoveToFolder extends AppCompatDialogFragment {
     // The public interface is used to send information back to the parent activity.
     public interface MoveToFolderListener {
-        void onCancelMoveToFolder(DialogFragment dialogFragment);
-
-        void onMoveToFolder(DialogFragment dialogFragment);
+        void onMoveToFolder(AppCompatDialogFragment dialogFragment);
     }
 
     // `moveToFolderListener` is used in `onAttach()` and `onCreateDialog`.
@@ -73,6 +73,7 @@ public class MoveToFolder extends DialogFragment {
     // `@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) {
         // Use `AlertDialog.Builder` to create the `AlertDialog`.  The style formats the color of the button text.
         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.LightAlertDialog);
@@ -84,8 +85,7 @@ public class MoveToFolder 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.
-                moveToFolderListener.onCancelMoveToFolder(MoveToFolder.this);
+                // Do nothing.  The `AlertDialog` will close automatically.
             }
         });
 
@@ -244,7 +244,7 @@ public class MoveToFolder extends DialogFragment {
         return alertDialog;
     }
 
-    public void addSubfoldersToExceptFolders(String folderName) {
+    private void addSubfoldersToExceptFolders(String folderName) {
         // Get a `Cursor` will all the immediate subfolders.
         Cursor subfoldersCursor = BookmarksActivity.bookmarksDatabaseHandler.getSubfoldersCursor(folderName);