X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FViewRequestDialog.java;h=fd8d68e12895393d5308fd6dc6040d610ac8aa06;hp=6969b32c4e6cb02ec562b0193008479247678ca9;hb=3d167d1ec7d0cef1ef032f20859bb0de8ddb01cf;hpb=bc45b14cfda10249800a6ccfdb8247d2ce9b32a9 diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.java index 6969b32c..fd8d68e1 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018 Soren Stoutner . + * Copyright © 2018-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -24,18 +24,21 @@ import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; +import android.content.SharedPreferences; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatDialogFragment; +import android.preference.PreferenceManager; import android.view.View; import android.view.WindowManager; import android.widget.Button; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; + import com.stoutner.privacybrowser.R; -import com.stoutner.privacybrowser.activities.MainWebViewActivity; +import com.stoutner.privacybrowser.helpers.BlockListHelper; -public class ViewRequestDialog extends AppCompatDialogFragment { +public class ViewRequestDialog extends DialogFragment { // The public interface is used to send information back to the parent activity. public interface ViewRequestListener { void onPrevious(int id); @@ -76,6 +79,13 @@ public class ViewRequestDialog extends AppCompatDialogFragment { // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`. @SuppressLint("InflateParams") public Dialog onCreateDialog(Bundle savedInstanceState) { + // Get a handle for the shared preferences. + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext()); + + // Get the theme and screenshot preferences. + boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false); + boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); + // Remove the incorrect lint warning that `getInt()` might be null. assert getArguments() != null; @@ -88,7 +98,7 @@ public class ViewRequestDialog extends AppCompatDialogFragment { AlertDialog.Builder dialogBuilder; // Set the style and icon according to the theme. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogDark); dialogBuilder.setIcon(R.drawable.block_ads_enabled_dark); } else { @@ -130,7 +140,7 @@ public class ViewRequestDialog extends AppCompatDialogFragment { final AlertDialog alertDialog = dialogBuilder.create(); // Disable screenshots if not allowed. - if (!MainWebViewActivity.allowScreenshots) { + if (!allowScreenshots) { // Remove the warning below that `getWindow()` might be null. assert alertDialog.getWindow() != null; @@ -142,7 +152,7 @@ public class ViewRequestDialog extends AppCompatDialogFragment { alertDialog.show(); // Get handles for the dialog views. - TextView requestAction = alertDialog.findViewById(R.id.request_action); + TextView requestDisposition = alertDialog.findViewById(R.id.request_disposition); TextView requestUrl = alertDialog.findViewById(R.id.request_url); TextView requestBlockListLabel = alertDialog.findViewById(R.id.request_blocklist_label); TextView requestBlockList = alertDialog.findViewById(R.id.request_blocklist); @@ -162,42 +172,54 @@ public class ViewRequestDialog extends AppCompatDialogFragment { nextButton.setEnabled(!isLastRequest); // Set the request action text. - switch (Integer.valueOf(requestDetails[MainWebViewActivity.REQUEST_DISPOSITION])) { - case MainWebViewActivity.REQUEST_DEFAULT: + switch (requestDetails[BlockListHelper.REQUEST_DISPOSITION]) { + case BlockListHelper.REQUEST_DEFAULT: + // Set the text. + requestDisposition.setText(R.string.default_allowed); + + // Set the background color. + requestDisposition.setBackgroundColor(getResources().getColor(R.color.transparent)); + break; + + case BlockListHelper.REQUEST_ALLOWED: // Set the text. - requestAction.setText(R.string.default_allowed); + requestDisposition.setText(R.string.allowed); // Set the background color. - requestAction.setBackgroundColor(getResources().getColor(R.color.transparent)); + if (darkTheme) { + requestDisposition.setBackgroundColor(getResources().getColor(R.color.blue_700_50)); + } else { + requestDisposition.setBackgroundColor(getResources().getColor(R.color.blue_100)); + } break; - case MainWebViewActivity.REQUEST_ALLOWED: + case BlockListHelper.REQUEST_THIRD_PARTY: // Set the text. - requestAction.setText(R.string.allowed); + requestDisposition.setText(R.string.third_party_blocked); // Set the background color. - if (MainWebViewActivity.darkTheme) { - requestAction.setBackgroundColor(getResources().getColor(R.color.blue_700_50)); + if (darkTheme) { + requestDisposition.setBackgroundColor(getResources().getColor(R.color.yellow_700_50)); } else { - requestAction.setBackgroundColor(getResources().getColor(R.color.blue_100)); + requestDisposition.setBackgroundColor(getResources().getColor(R.color.yellow_100)); } break; - case MainWebViewActivity.REQUEST_BLOCKED: + case BlockListHelper.REQUEST_BLOCKED: // Set the text. - requestAction.setText(R.string.blocked); + requestDisposition.setText(R.string.blocked); // Set the background color. - if (MainWebViewActivity.darkTheme) { - requestAction.setBackgroundColor(getResources().getColor(R.color.red_700_50)); + if (darkTheme) { + requestDisposition.setBackgroundColor(getResources().getColor(R.color.red_700_40)); } else { - requestAction.setBackgroundColor(getResources().getColor(R.color.red_100)); + requestDisposition.setBackgroundColor(getResources().getColor(R.color.red_100)); } break; } // Display the request URL. - requestUrl.setText(requestDetails[MainWebViewActivity.REQUEST_URL]); + requestUrl.setText(requestDetails[BlockListHelper.REQUEST_URL]); // Modify the dialog based on the request action. if (requestDetails.length == 2) { // A default request. @@ -212,93 +234,97 @@ public class ViewRequestDialog extends AppCompatDialogFragment { requestBlockListOriginalEntry.setVisibility(View.GONE); } else { // A blocked or allowed request. // Set the text on the text views. - requestBlockList.setText(requestDetails[MainWebViewActivity.REQUEST_BLOCKLIST]); - requestBlockListEntries.setText(requestDetails[MainWebViewActivity.REQUEST_BLOCKLIST_ENTRIES]); - requestBlockListOriginalEntry.setText(requestDetails[MainWebViewActivity.REQUEST_BLOCKLIST_ORIGINAL_ENTRY]); + requestBlockList.setText(requestDetails[BlockListHelper.REQUEST_BLOCKLIST]); + requestBlockListEntries.setText(requestDetails[BlockListHelper.REQUEST_BLOCKLIST_ENTRIES]); + requestBlockListOriginalEntry.setText(requestDetails[BlockListHelper.REQUEST_BLOCKLIST_ORIGINAL_ENTRY]); // Set the sublist text. - switch (Integer.valueOf(requestDetails[MainWebViewActivity.REQUEST_SUBLIST])) { - case MainWebViewActivity.MAIN_WHITELIST: + switch (requestDetails[BlockListHelper.REQUEST_SUBLIST]) { + case BlockListHelper.MAIN_WHITELIST: requestSubList.setText(R.string.main_whitelist); break; - case MainWebViewActivity.FINAL_WHITELIST: + case BlockListHelper.FINAL_WHITELIST: requestSubList.setText(R.string.final_whitelist); break; - case MainWebViewActivity.DOMAIN_WHITELIST: + case BlockListHelper.DOMAIN_WHITELIST: requestSubList.setText(R.string.domain_whitelist); break; - case MainWebViewActivity.DOMAIN_INITIAL_WHITELIST: + case BlockListHelper.DOMAIN_INITIAL_WHITELIST: requestSubList.setText(R.string.domain_initial_whitelist); break; - case MainWebViewActivity.DOMAIN_FINAL_WHITELIST: + case BlockListHelper.DOMAIN_FINAL_WHITELIST: requestSubList.setText(R.string.domain_final_whitelist); break; - case MainWebViewActivity.THIRD_PARTY_WHITELIST: + case BlockListHelper.THIRD_PARTY_WHITELIST: requestSubList.setText(R.string.third_party_whitelist); break; - case MainWebViewActivity.THIRD_PARTY_DOMAIN_WHITELIST: + case BlockListHelper.THIRD_PARTY_DOMAIN_WHITELIST: requestSubList.setText(R.string.third_party_domain_whitelist); break; - case MainWebViewActivity.THIRD_PARTY_DOMAIN_INITIAL_WHITELIST: + case BlockListHelper.THIRD_PARTY_DOMAIN_INITIAL_WHITELIST: requestSubList.setText(R.string.third_party_domain_initial_whitelist); break; - case MainWebViewActivity.MAIN_BLACKLIST: + case BlockListHelper.MAIN_BLACKLIST: requestSubList.setText(R.string.main_blacklist); break; - case MainWebViewActivity.INITIAL_BLACKLIST: + case BlockListHelper.INITIAL_BLACKLIST: requestSubList.setText(R.string.initial_blacklist); break; - case MainWebViewActivity.FINAL_BLACKLIST: + case BlockListHelper.FINAL_BLACKLIST: requestSubList.setText(R.string.final_blacklist); break; - case MainWebViewActivity.DOMAIN_BLACKLIST: + case BlockListHelper.DOMAIN_BLACKLIST: requestSubList.setText(R.string.domain_blacklist); break; - case MainWebViewActivity.DOMAIN_INITIAL_BLACKLIST: + case BlockListHelper.DOMAIN_INITIAL_BLACKLIST: requestSubList.setText(R.string.domain_initial_blacklist); break; - case MainWebViewActivity.DOMAIN_FINAL_BLACKLIST: + case BlockListHelper.DOMAIN_FINAL_BLACKLIST: requestSubList.setText(R.string.domain_final_blacklist); break; - case MainWebViewActivity.DOMAIN_REGULAR_EXPRESSION_BLACKLIST: + case BlockListHelper.DOMAIN_REGULAR_EXPRESSION_BLACKLIST: requestSubList.setText(R.string.domain_regular_expression_blacklist); break; - case MainWebViewActivity.THIRD_PARTY_BLACKLIST: + case BlockListHelper.THIRD_PARTY_BLACKLIST: requestSubList.setText(R.string.third_party_blacklist); break; - case MainWebViewActivity.THIRD_PARTY_DOMAIN_BLACKLIST: + case BlockListHelper.THIRD_PARTY_INITIAL_BLACKLIST: + requestSubList.setText(R.string.third_party_initial_blacklist); + break; + + case BlockListHelper.THIRD_PARTY_DOMAIN_BLACKLIST: requestSubList.setText(R.string.third_party_domain_blacklist); break; - case MainWebViewActivity.THIRD_PARTY_DOMAIN_INITIAL_BLACKLIST: + case BlockListHelper.THIRD_PARTY_DOMAIN_INITIAL_BLACKLIST: requestSubList.setText(R.string.third_party_domain_initial_blacklist); break; - case MainWebViewActivity.THIRD_PARTY_REGULAR_EXPRESSION_BLACKLIST: + case BlockListHelper.THIRD_PARTY_REGULAR_EXPRESSION_BLACKLIST: requestSubList.setText(R.string.third_party_regular_expression_blacklist); break; - case MainWebViewActivity.THIRD_PARTY_DOMAIN_REGULAR_EXPRESSION_BLACKLIST: + case BlockListHelper.THIRD_PARTY_DOMAIN_REGULAR_EXPRESSION_BLACKLIST: requestSubList.setText(R.string.third_party_domain_regular_expression_blacklist); break; - case MainWebViewActivity.REGULAR_EXPRESSION_BLACKLIST: + case BlockListHelper.REGULAR_EXPRESSION_BLACKLIST: requestSubList.setText(R.string.regular_expression_blacklist); break; } @@ -307,4 +333,4 @@ public class ViewRequestDialog extends AppCompatDialogFragment { // `onCreateDialog` requires the return of an alert dialog. return alertDialog; } -} +} \ No newline at end of file