Switch to AppCompatDialogFragment for dialogs that return values due to crashes in...

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

diff --git a/app/src/main/java/com/stoutner/privacybrowser/MoveToFolder.java b/app/src/main/java/com/stoutner/privacybrowser/MoveToFolder.java
index 66e81253b20ce99682e64c0fe8689add64ad94f7..60f7707f81d4b9b47c49abfbfcf517af60b778dc 100644 (file)
--- 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,10 +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 onMoveToFolder(DialogFragment dialogFragment);
+        void onMoveToFolder(AppCompatDialogFragment dialogFragment);
     }
 
     // `moveToFolderListener` is used in `onAttach()` and `onCreateDialog`.
@@ -71,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);