X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FCreateBookmarkFolder.java;h=46d2ed96cbb4c2fe8257f6bde0cd997b5cc33611;hb=1bd5ba3b9f91e69517fa8a39665256f0badc408b;hp=0847ce3fac162e782de3c2e5a592043a0a4e37e2;hpb=c4ad9f457f41cbc86391e0099629cd94a235258a;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/CreateBookmarkFolder.java b/app/src/main/java/com/stoutner/privacybrowser/CreateBookmarkFolder.java
index 0847ce3f..46d2ed96 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/CreateBookmarkFolder.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/CreateBookmarkFolder.java
@@ -19,42 +19,46 @@
 
 package com.stoutner.privacybrowser;
 
-import android.app.Activity;
+import android.annotation.SuppressLint;
 import android.app.Dialog;
-import android.app.DialogFragment;
+import android.content.Context;
 import android.content.DialogInterface;
 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.v7.app.AlertDialog;
+// We have to use `AppCompatDialogFragment` instead of `DialogFragment` or an error is produced on API <=22.
+import android.support.v7.app.AppCompatDialogFragment;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.ImageView;
 
-public class CreateBookmarkFolder extends DialogFragment {
+public class CreateBookmarkFolder extends AppCompatDialogFragment {
     // The public interface is used to send information back to the parent activity.
     public interface CreateBookmarkFolderListener {
-        void onCancelCreateBookmarkFolder(DialogFragment dialogFragment);
-
-        void onCreateBookmarkFolder(DialogFragment dialogFragment);
+        void onCreateBookmarkFolder(AppCompatDialogFragment dialogFragment);
     }
 
     // `createBookmarkFolderListener` is used in `onAttach()` and `onCreateDialog`.
     private CreateBookmarkFolderListener createBookmarkFolderListener;
 
-    public void onAttach(Activity parentActivity) {
-        super.onAttach(parentActivity);
+    public void onAttach(Context context) {
+        super.onAttach(context);
 
-        // Get a handle for `createBookmarkFolderListener` from `parentActivity`.
+        // Get a handle for `createBookmarkFolderListener` from `context`.
         try {
-            createBookmarkFolderListener = (CreateBookmarkFolderListener) parentActivity;
+            createBookmarkFolderListener = (CreateBookmarkFolderListener) context;
         } catch(ClassCastException exception) {
-            throw new ClassCastException(parentActivity.toString() + " must implement CreateBookmarkFolderListener.");
+            throw new ClassCastException(context.toString() + " must implement CreateBookmarkFolderListener.");
         }
     }
 
+    // `@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.
         final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.LightAlertDialog);
@@ -66,8 +70,7 @@ public class CreateBookmarkFolder extends DialogFragment {
         dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                // Return the `DialogFragment` to the parent activity on cancel.
-                createBookmarkFolderListener.onCancelCreateBookmarkFolder(CreateBookmarkFolder.this);
+                // Do nothing.  The `AlertDialog` will close automatically.
             }
         });
 
@@ -84,6 +87,9 @@ public class CreateBookmarkFolder extends DialogFragment {
         // Create an `AlertDialog` from the `AlertDialog.Builder`.
         final AlertDialog alertDialog = dialogBuilder.create();
 
+        // Remove the warning below that `setSoftInputMode` might produce `java.lang.NullPointerException`.
+        assert alertDialog.getWindow() != null;
+
         // Show the keyboard when the `Dialog` is displayed on the screen.
         alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);