/*
- * Copyright © 2018-2019 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2018-2020 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
package com.stoutner.privacybrowser.activities;
import android.content.Context;
+import android.content.Intent;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.database.MatrixCursor;
import com.stoutner.privacybrowser.R;
import com.stoutner.privacybrowser.adapters.RequestsArrayAdapter;
import com.stoutner.privacybrowser.dialogs.ViewRequestDialog;
-import com.stoutner.privacybrowser.helpers.BlockListHelper;
+import com.stoutner.privacybrowser.helpers.BlocklistHelper;
import java.util.ArrayList;
import java.util.List;
public class RequestsActivity extends AppCompatActivity implements ViewRequestDialog.ViewRequestListener {
// The resource requests are populated by `MainWebViewActivity` before `RequestsActivity` is launched.
- public static ArrayList<String[]> resourceRequests;
+ public static List<String[]> resourceRequests;
// The list view is used in `onCreate()` and `launchViewRequestDialog()`.
private ListView requestsListView;
// Get a handle for the shared preferences.
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
- // Get the screenshot and theme preferences.
+ // Get the screenshot preference.
boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false);
- boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false);
// Disable screenshots if not allowed.
if (!allowScreenshots) {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
}
- // Set the activity theme.
- if (darkTheme) {
- setTheme(R.style.PrivacyBrowserDark_SecondaryActivity);
- } else {
- setTheme(R.style.PrivacyBrowserLight_SecondaryActivity);
- }
+ // Set the theme.
+ setTheme(R.style.PrivacyBrowser);
// Run the default commands.
super.onCreate(savedInstanceState);
+ // Get the launching intent
+ Intent intent = getIntent();
+
+ // Get the status of the third-party blocklist.
+ boolean blockAllThirdPartyRequests = intent.getBooleanExtra("block_all_third_party_requests", false);
+
// Set the content view.
setContentView(R.layout.requests_coordinatorlayout);
// Populate the resource array lists.
for (String[] request : resourceRequests) {
- switch (request[BlockListHelper.REQUEST_DISPOSITION]) {
- case BlockListHelper.REQUEST_DEFAULT:
+ switch (request[BlocklistHelper.REQUEST_DISPOSITION]) {
+ case BlocklistHelper.REQUEST_DEFAULT:
// Add the request to the list of all requests.
allResourceRequests.add(request);
defaultResourceRequests.add(request);
break;
- case BlockListHelper.REQUEST_ALLOWED:
+ case BlocklistHelper.REQUEST_ALLOWED:
// Add the request to the list of all requests.
allResourceRequests.add(request);
allowedResourceRequests.add(request);
break;
- case BlockListHelper.REQUEST_THIRD_PARTY:
+ case BlocklistHelper.REQUEST_THIRD_PARTY:
// Add the request to the list of all requests.
allResourceRequests.add(request);
thirdPartyResourceRequests.add(request);
break;
- case BlockListHelper.REQUEST_BLOCKED:
+ case BlocklistHelper.REQUEST_BLOCKED:
// Add the request to the list of all requests.
allResourceRequests.add(request);
spinnerCursor.addRow(new Object[]{0, getString(R.string.all) + " - " + allResourceRequests.size()});
spinnerCursor.addRow(new Object[]{1, getString(R.string.default_label) + " - " + defaultResourceRequests.size()});
spinnerCursor.addRow(new Object[]{2, getString(R.string.allowed_plural) + " - " + allowedResourceRequests.size()});
- if (MainWebViewActivity.blockAllThirdPartyRequests) {
+ if (blockAllThirdPartyRequests) {
spinnerCursor.addRow(new Object[]{3, getString(R.string.third_party_plural) + " - " + thirdPartyResourceRequests.size()});
}
spinnerCursor.addRow(new Object[]{4, getString(R.string.blocked_plural) + " - " + blockedResourceRequests.size()});