X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FDownloadImageDialog.java;h=2221bfe98c20b5ffebbad4019d1d7f1abb73a2f0;hp=eb45dd1bc8e3313e373df3c19a805b896fc6bcf4;hb=0a5d2eabceeafb49a957598538aa74d4f11dfce0;hpb=e923db59fff5ad31f08679c84678cdfb1ca87d63 diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/DownloadImageDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/DownloadImageDialog.java index eb45dd1b..2221bfe9 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/DownloadImageDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/DownloadImageDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 Soren Stoutner . + * Copyright © 2016-2018 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -36,6 +36,7 @@ import android.view.WindowManager; import android.widget.EditText; import com.stoutner.privacybrowser.R; +import com.stoutner.privacybrowser.activities.MainWebViewActivity; // `android.support.v7.app.AlertDialog` uses more of the horizontal screen real estate versus `android.app.AlertDialog's` smaller width. // We have to use `AppCompatDialogFragment` instead of `DialogFragment` or an error is produced on API <=22. @@ -45,19 +46,21 @@ public class DownloadImageDialog extends AppCompatDialogFragment { private String imageFileName; public static DownloadImageDialog imageUrl(String imageUrlString) { - // Create `argumentsBundle`. + // Create an arguments bundle. Bundle argumentsBundle = new Bundle(); + // Create a variable for the image name string. String imageNameString; + // Extract the image name string from the image URL. Uri imageUri = Uri.parse(imageUrlString); imageNameString = imageUri.getLastPathSegment(); - // Store the variables in the `Bundle`. + // Store the variables in the bundle. argumentsBundle.putString("URL", imageUrlString); argumentsBundle.putString("Image_Name", imageNameString); - // Add `argumentsBundle` to this instance of `DownloadFileDialog`. + // Add the arguments bundle to this instance of `DownloadFileDialog`. DownloadImageDialog thisDownloadFileDialog = new DownloadImageDialog(); thisDownloadFileDialog.setArguments(argumentsBundle); return thisDownloadFileDialog; @@ -67,6 +70,9 @@ public class DownloadImageDialog extends AppCompatDialogFragment { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + // Remove the warning below that `getArguments()` might be null. + assert getArguments() != null; + // Store the strings in the local class variables. imageUrl = getArguments().getString("URL"); imageFileName = getArguments().getString("Image_Name"); @@ -96,68 +102,78 @@ public class DownloadImageDialog extends AppCompatDialogFragment { @Override @NonNull public Dialog onCreateDialog(Bundle savedInstanceState) { + // Remove the warning below that `.getActivity()` might be null. + assert getActivity() != null; + // Get the activity's layout inflater. LayoutInflater layoutInflater = getActivity().getLayoutInflater(); - // Use `AlertDialog.Builder` to create the `AlertDialog`. `R.style.lightAlertDialog` formats the color of the button text. - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.LightAlertDialog); + // Use and alert dialog builder to create the alert dialog. + AlertDialog.Builder dialogBuilder; + + // Set the style according to the theme. + if (MainWebViewActivity.darkTheme) { + dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogDark); + } else { + dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogLight); + } + + // Set the title. dialogBuilder.setTitle(R.string.save_image_as); - // The parent view is `null` because it will be assigned by `AlertDialog`. + + // Set the view. The parent view is `null` because it will be assigned by `AlertDialog`. dialogBuilder.setView(layoutInflater.inflate(R.layout.download_image_dialog, null)); - // Set an `onClick()` listener on the negative button. - dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // Do nothing if `Cancel` is clicked. - } + // Set an listener on the negative button. + dialogBuilder.setNegativeButton(R.string.cancel, (DialogInterface dialog, int which) -> { + // Do nothing if `Cancel` is clicked. }); - // Set an `onClick()` listener on the positive button - dialogBuilder.setPositiveButton(R.string.download, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // trigger `onDownloadFile()` and return the `DialogFragment` and the download URL to the parent activity. - downloadImageListener.onDownloadImage(DownloadImageDialog.this, imageUrl); - } + // Set an listener on the positive button + dialogBuilder.setPositiveButton(R.string.download, (DialogInterface dialog, int which) -> { + // trigger `onDownloadFile()` and return the `DialogFragment` and the download URL to the parent activity. + downloadImageListener.onDownloadImage(DownloadImageDialog.this, imageUrl); }); - // Create an `AlertDialog` from the `AlertDialog.Builder`. + // Create an alert dialog from the alert dialog builder. final AlertDialog alertDialog = dialogBuilder.create(); - // Remove the warning below that `setSoftInputMode` might produce `java.lang.NullPointerException`. + // Remove the warning below that `getWindow()` might be null. assert alertDialog.getWindow() != null; + // Disable screenshots if not allowed. + if (!MainWebViewActivity.allowScreenshots) { + alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); + } + // Show the keyboard when `alertDialog` is displayed on the screen. alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE); - // We need to show `alertDialog` before we can modify the contents. + // The alert dialog must be shown before the contents can be modified. alertDialog.show(); // Set the text for `downloadImageNameTextView`. - EditText downloadImageNameTextView = (EditText) alertDialog.findViewById(R.id.download_image_name); + EditText downloadImageNameTextView = alertDialog.findViewById(R.id.download_image_name); downloadImageNameTextView.setText(imageFileName); // Allow the `enter` key on the keyboard to save the file from `downloadImageNameTextView`. - downloadImageNameTextView.setOnKeyListener(new View.OnKeyListener() { - @Override - public boolean onKey (View v, int keyCode, KeyEvent event) { - // If the event is an `ACTION_DOWN` on the `enter` key, initiate the download. - if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) { - // trigger `onDownloadImage()` and return the `DialogFragment` and the URL to the parent activity. - downloadImageListener.onDownloadImage(DownloadImageDialog.this, imageUrl); - // Manually dismiss `alertDialog`. - alertDialog.dismiss(); - // Consume the event. - return true; - } else { // If any other key was pressed, do not consume the event. - return false; - } + downloadImageNameTextView.setOnKeyListener((View v, int keyCode, KeyEvent event) -> { + // If the event is an `ACTION_DOWN` on the `enter` key, initiate the download. + if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) { + // trigger `onDownloadImage()` and return the `DialogFragment` and the URL to the parent activity. + downloadImageListener.onDownloadImage(DownloadImageDialog.this, imageUrl); + + // Manually dismiss the alert dialog. + alertDialog.dismiss(); + + // Consume the event. + return true; + } else { // If any other key was pressed, do not consume the event. + return false; } }); - // `onCreateDialog` requires the return of an `AlertDialog`. return alertDialog; }