X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FHttpAuthenticationDialog.java;h=46af64e73bf361eee8ebf393f56568938cfd9016;hp=6110ed541b8dadf73b3226f8cef7a7935b79a388;hb=012e5595c82d6e8d0b8a46f1ef18a02a56341182;hpb=80187b7215a5effdbe97ac48e8af34824a05c287 diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.java index 6110ed54..46af64e7 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.java @@ -42,34 +42,8 @@ import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.activities.MainWebViewActivity; public class HttpAuthenticationDialog extends AppCompatDialogFragment{ - - // The private variables are used in `onCreate()` and `onCreateDialog()`. - private String httpAuthHost; - private String httpAuthRealm; - - public static HttpAuthenticationDialog displayDialog(String host, String realm) { - // Store the strings in a `Bundle`. - Bundle argumentsBundle = new Bundle(); - argumentsBundle.putString("Host", host); - argumentsBundle.putString("Realm", realm); - - // Add `argumentsBundle` to this instance of `HttpAuthenticationDialog`. - HttpAuthenticationDialog thisHttpAuthenticationDialog = new HttpAuthenticationDialog(); - thisHttpAuthenticationDialog.setArguments(argumentsBundle); - return thisHttpAuthenticationDialog; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - // Remove the incorrect lint warnings that `getString()` might be null. - assert getArguments() != null; - - // Save the host and realm in class variables. - httpAuthHost = getArguments().getString("Host"); - httpAuthRealm = getArguments().getString("Realm"); - } + // `httpAuthenticationListener` is used in `onAttach()` and `onCreateDialog()` + private HttpAuthenticationListener httpAuthenticationListener; // The public interface is used to send information back to the parent activity. public interface HttpAuthenticationListener { @@ -78,18 +52,23 @@ public class HttpAuthenticationDialog extends AppCompatDialogFragment{ void onHttpAuthenticationProceed(AppCompatDialogFragment dialogFragment); } - // `httpAuthenticationListener` is used in `onAttach()` and `onCreateDialog()` - private HttpAuthenticationListener httpAuthenticationListener; - public void onAttach(Context context) { super.onAttach(context); // Get a handle for `httpAuthenticationListener` from `context`. - try { - httpAuthenticationListener = (HttpAuthenticationListener) context; - } catch(ClassCastException exception) { - throw new ClassCastException(context.toString() + " must implement `HttpAuthenticationListener`."); - } + httpAuthenticationListener = (HttpAuthenticationListener) context; + } + + public static HttpAuthenticationDialog displayDialog(String host, String realm) { + // Store the strings in a `Bundle`. + Bundle argumentsBundle = new Bundle(); + argumentsBundle.putString("Host", host); + argumentsBundle.putString("Realm", realm); + + // Add `argumentsBundle` to this instance of `HttpAuthenticationDialog`. + HttpAuthenticationDialog thisHttpAuthenticationDialog = new HttpAuthenticationDialog(); + thisHttpAuthenticationDialog.setArguments(argumentsBundle); + return thisHttpAuthenticationDialog; } // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`. @@ -97,6 +76,13 @@ public class HttpAuthenticationDialog extends AppCompatDialogFragment{ @Override @NonNull public Dialog onCreateDialog(Bundle savedInstanceState) { + // Remove the incorrect lint warnings that `getString()` might be null. + assert getArguments() != null; + + // Get the host and realm variables from the bundle. + String httpAuthHost = getArguments().getString("Host"); + String httpAuthRealm = getArguments().getString("Realm"); + // Remove the incorrect lint warning that `getActivity()` might be null. assert getActivity() != null;