/*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-// We have to use `AppCompatDialogFragment` instead of `DialogFragment` or an error is produced on API <= 22. `android.support.v7.app.AlertDialog` also uses more of the horizontal screen real estate versus `android.app.AlertDialog's` smaller width.
-import android.support.v7.app.AppCompatDialogFragment;
import android.util.Base64;
import android.view.LayoutInflater;
import android.view.View;
+import android.view.WindowManager;
import android.webkit.WebBackForwardList;
import android.widget.AdapterView;
import android.widget.ListView;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.DialogFragment; // The AndroidX dialog fragment must be used or an error is produced on API <=22.
+
import com.stoutner.privacybrowser.R;
+import com.stoutner.privacybrowser.activities.MainWebViewActivity;
import com.stoutner.privacybrowser.adapters.HistoryArrayAdapter;
import com.stoutner.privacybrowser.definitions.History;
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
-public class UrlHistoryDialog extends AppCompatDialogFragment{
+public class UrlHistoryDialog extends DialogFragment{
// `historyArrayList` and `currentPageId` pass information from `onCreate()` to `onCreateDialog()`.
- private ArrayList<History> historyArrayList = new ArrayList<>();
+ private final ArrayList<History> historyArrayList = new ArrayList<>();
private int currentPageId;
public static UrlHistoryDialog loadBackForwardList(Context context, WebBackForwardList webBackForwardList) {
- // Create `argumentsBundle`.
+ // Create an arguments bundle.
Bundle argumentsBundle = new Bundle();
- // Store `currentPageIndex`.
+ // Store the current page index.
int currentPageIndex = webBackForwardList.getCurrentIndex();
- // Setup `urlArrayList` and `iconArrayList`.
+ // Setup the URL array list and the icon array list.
ArrayList<String> urlArrayList = new ArrayList<>();
ArrayList<String> iconBase64StringArrayList = new ArrayList<>();
- // Get the default favorite icon `Drawable`.
+ // Get the default favorite icon drawable. `ContextCompat` must be used until the minimum API >= 21.
Drawable defaultFavoriteIconDrawable = ContextCompat.getDrawable(context, R.drawable.world);
- // Convert `defaultFavoriteIconDrawable` to a `BitmapDrawable`.
+ // Convert the default favorite icon drawable to a `BitmapDrawable`.
BitmapDrawable defaultFavoriteIconBitmapDrawable = (BitmapDrawable) defaultFavoriteIconDrawable;
- // Extract a `Bitmap` from `defaultFavoriteIconBitmapDrawable`.
+ // Remove the incorrect lint error that `getBitmap()` might be null.
+ assert defaultFavoriteIconBitmapDrawable != null;
+
+ // Extract a `Bitmap` from the default favorite icon `BitmapDrawable`.
Bitmap defaultFavoriteIcon = defaultFavoriteIconBitmapDrawable.getBitmap();
- // Populate `urlArrayList` and `iconArrayList` from `webBackForwardList`.
+ // Populate the URL array list and the icon array list from `webBackForwardList`.
for (int i=0; i < webBackForwardList.getSize(); i++) {
// Store the URL.
urlArrayList.add(webBackForwardList.getItemAtIndex(i).getUrl());
- // Create a variable to store the icon `Bitmap`.
+ // Create a variable to store the icon bitmap.
Bitmap iconBitmap;
- // Store the icon `Bitmap`.
+ // Store the icon bitmap.
if (webBackForwardList.getItemAtIndex(i).getFavicon() == null) {
// If `webBackForwardList` does not have a favorite icon, use Privacy Browser's default world icon.
iconBitmap = defaultFavoriteIcon;
// Create a `ByteArrayOutputStream`.
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ // Remove the incorrect lint error that `compress()` might be null;
+ assert iconBitmap != null;
+
// Convert the favorite icon `Bitmap` to a `ByteArrayOutputStream`. `100` is the compression quality, which is ignored by `PNG`.
iconBitmap.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream);
argumentsBundle.putStringArrayList("URL_History", urlArrayList);
argumentsBundle.putStringArrayList("Favorite_Icons", iconBase64StringArrayList);
- // Add `argumentsBundle` to this instance of `UrlHistoryDialog`.
+ // Add the arguments bundle to this instance of `UrlHistoryDialog`.
UrlHistoryDialog thisUrlHistoryDialog = new UrlHistoryDialog();
thisUrlHistoryDialog.setArguments(argumentsBundle);
return thisUrlHistoryDialog;
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ // Remove the incorrect lint error that `getArguments()` might be null.
+ assert getArguments() != null;
+
// Get the `ArrayLists` from the `Arguments`.
ArrayList<String> urlStringArrayList = getArguments().getStringArrayList("URL_History");
ArrayList<String> favoriteIconBase64StringArrayList = getArguments().getStringArrayList("Favorite_Icons");
// `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
@SuppressLint("InflateParams")
public Dialog onCreateDialog(Bundle savedInstanceState) {
+ // Remove the incorrect lint warning 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 an 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.history);
dialogBuilder.setView(layoutInflater.inflate(R.layout.url_history_dialog, null));
// Set an `onClick()` listener on the negative button.
- dialogBuilder.setNegativeButton(R.string.clear_history, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- // Clear the history.
- urlHistoryListener.onClearHistory();
- }
+ dialogBuilder.setNegativeButton(R.string.clear_history, (DialogInterface dialog, int which) -> {
+ // Clear the history.
+ urlHistoryListener.onClearHistory();
});
// Set an `onClick()` listener on the positive button.
- dialogBuilder.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- // Do nothing if `Close` is clicked. The `Dialog` will automatically close.
- }
+ dialogBuilder.setPositiveButton(R.string.close, (DialogInterface dialog, int which) -> {
+ // Do nothing if `Close` is clicked. The `Dialog` will automatically close.
});
- // Create an `AlertDialog` from the `AlertDialog.Builder`.
+ // Create an alert dialog from the alert dialog builder.
final AlertDialog alertDialog = dialogBuilder.create();
- // We need to show `alertDialog` before we can modify the contents.
+ // Disable screenshots if not allowed.
+ if (!MainWebViewActivity.allowScreenshots) {
+ // Remove the warning below that `getWindow()` might be null.
+ assert alertDialog.getWindow() != null;
+
+ // Disable screenshots.
+ alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+ }
+
+ //The alert dialog must be shown before the contents can be modified.
alertDialog.show();
// Instantiate a `HistoryArrayAdapter`.
- final HistoryArrayAdapter historyArrayAdapter = new HistoryArrayAdapter(getContext(), historyArrayList, currentPageId);
+ HistoryArrayAdapter historyArrayAdapter = new HistoryArrayAdapter(getContext(), historyArrayList, currentPageId);
- // Get a handle for `listView`.
- ListView listView = (ListView) alertDialog.findViewById(R.id.history_listview);
+ // Get a handle for the list view.
+ ListView listView = alertDialog.findViewById(R.id.history_listview);
- // Set the adapter on `listView`.
+ // Set the list view adapter.
listView.setAdapter(historyArrayAdapter);
- // Listen for clicks on entries in `listView`.
- listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
- @Override
- public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- // Convert the `long` `id` to an `int`.
- int itemId = (int) id;
-
- // Only consume the click if it is not on the `currentPageId`.
- if (itemId != currentPageId) {
- // Go forward or back to `itemId`.
- urlHistoryListener.onUrlHistoryEntrySelected(currentPageId - itemId);
-
- // Dismiss the `Dialog`.
- alertDialog.dismiss();
- }
+ // Listen for clicks on entries in the list view.
+ listView.setOnItemClickListener((AdapterView<?> parent, View view, int position, long id) -> {
+ // Convert the long ID to an int.
+ int itemId = (int) id;
+
+ // Only consume the click if it is not on the `currentPageId`.
+ if (itemId != currentPageId) {
+ // Go forward or back to `itemId`.
+ urlHistoryListener.onUrlHistoryEntrySelected(currentPageId - itemId);
+
+ // Dismiss the `Dialog`.
+ alertDialog.dismiss();
}
});
projects / PrivacyBrowserAndroid.git / blobdiff