import android.net.Uri;
import android.net.http.SslCertificate;
import android.net.http.SslError;
-import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import com.google.android.material.tabs.TabLayout;
import com.stoutner.privacybrowser.BuildConfig;
import com.stoutner.privacybrowser.R;
+import com.stoutner.privacybrowser.asynctasks.GetHostIpAddresses;
import com.stoutner.privacybrowser.dialogs.AdConsentDialog;
import com.stoutner.privacybrowser.dialogs.CreateBookmarkDialog;
import com.stoutner.privacybrowser.dialogs.CreateBookmarkFolderDialog;
import java.io.File;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import java.lang.ref.WeakReference;
-import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLDecoder;
import java.net.URLEncoder;
-import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
// It is also used in `onCreate()` and `checkPinnedMismatch()`.
public static SslCertificate sslCertificate;
- // `currentHostIpAddresses` is public static so it can be accessed from `DomainSettingsFragment` and `ViewSslCertificateDialog`.
+ // `currentHostIpAddresses` is public static so it can be accessed from `DomainSettingsFragment`, `GetHostIpAddresses()`, and `ViewSslCertificateDialog`.
// It is also used in `onCreate()` and `GetHostIpAddresses()`.
public static String currentHostIpAddresses;
+ // The getting IP addresses tracker is used in `onCreate() and `GetHostIpAddresses`.
+ public static boolean gettingIpAddresses;
+
+ // The URL loading tracker is public static so it can be accessed from `GetHostIpAddresses`.
+ // It is also used in `onCreate()`, `onCreateOptionsMenu()`, `loadUrl()`, `applyDomainSettings()`, and `GetHostIpAddresses`.
+ public static boolean urlIsLoading;
+
// `orbotStatus` is public static so it can be accessed from `OrbotProxyHelper`. It is also used in `onCreate()`, `onResume()`, and `applyProxyThroughOrbot()`.
public static String orbotStatus;
// `onSaveEditBookmark()`, `onSaveEditBookmarkFolder()`, and `loadBookmarksFolder()`.
public static String currentBookmarksFolder;
- // `domainSettingsDatabaseId` is public static so it can be accessed from `PinnedMismatchDialog`. It is also used in `onCreate()`, `onOptionsItemSelected()`, and `applyDomainSettings()`.
- public static int domainSettingsDatabaseId;
-
// The pinned variables are public static so they can be accessed from `PinnedMismatchDialog`. They are also used in `onCreate()`, `applyDomainSettings()`, and `checkPinnedMismatch()`.
public static String pinnedSslIssuedToCName;
public static String pinnedSslIssuedToOName;
- // `urlIsLoading` is used in `onCreate()`, `onCreateOptionsMenu()`, `loadUrl()`, `applyDomainSettings()`, and `GetHostIpAddresses`.
- private static boolean urlIsLoading;
-
- // `gettingIpAddresses` is used in `onCreate() and `GetHostIpAddresses`.
- private static boolean gettingIpAddresses;
-
// `pinnedDomainSslCertificate` is used in `onCreate()`, `applyDomainSettings()`, and `checkPinnedMismatch()`.
private static boolean pinnedSslCertificate;
private boolean navigatingHistory;
// The current WebView is used in `onCreate()`, `onPrepareOptionsMenu()`, `onOptionsItemSelected()`, `onNavigationItemSelected()`, `onRestart()`, `onCreateContextMenu()`, `findPreviousOnPage()`,
- // `findNextOnPage()`, `closeFindOnPage()`, `loadUrlFromTextBox()`, `onSslMismatchBack()`, and `applyProxyThroughOrbot()`.
+ // `findNextOnPage()`, `closeFindOnPage()`, `loadUrlFromTextBox()`, `onSslMismatchBack()`, `applyProxyThroughOrbot()`, and `applyDomainSettings()`.
private NestedScrollWebView currentWebView;
// `fullScreenVideoFrameLayout` is used in `onCreate()` and `onConfigurationChanged()`.
// `waitingForOrbot` is used in `onCreate()`, `onResume()`, and `applyProxyThroughOrbot()`.
private boolean waitingForOrbot;
- // `domainSettingsApplied` is used in `prepareOptionsMenu()` and `applyDomainSettings()`.
- private boolean domainSettingsApplied;
-
// `domainSettingsJavaScriptEnabled` is used in `onOptionsItemSelected()` and `applyDomainSettings()`.
private Boolean domainSettingsJavaScriptEnabled;
// The action bar drawer toggle is initialized in `onCreate()` and used in `onResume()`.
private ActionBarDrawerToggle actionBarDrawerToggle;
- // `urlTextBox` is used in `onCreate()`, `onOptionsItemSelected()`, `loadUrlFromTextBox()`, `loadUrl()`, and `highlightUrlText()`.
- private EditText urlTextBox;
-
// The color spans are used in `onCreate()` and `highlightUrlText()`.
private ForegroundColorSpan redColorSpan;
private ForegroundColorSpan initialGrayColorSpan;
finalGrayColorSpan = new ForegroundColorSpan(resources.getColor(R.color.gray_500));
// Get a handle for `urlTextBox`.
- urlTextBox = findViewById(R.id.url_edittext);
+ EditText urlEditText = findViewById(R.id.url_edittext);
// Remove the formatting from `urlTextBar` when the user is editing the text.
- urlTextBox.setOnFocusChangeListener((View v, boolean hasFocus) -> {
+ urlEditText.setOnFocusChangeListener((View v, boolean hasFocus) -> {
if (hasFocus) { // The user is editing the URL text box.
// Remove the highlighting.
- urlTextBox.getText().removeSpan(redColorSpan);
- urlTextBox.getText().removeSpan(initialGrayColorSpan);
- urlTextBox.getText().removeSpan(finalGrayColorSpan);
+ urlEditText.getText().removeSpan(redColorSpan);
+ urlEditText.getText().removeSpan(initialGrayColorSpan);
+ urlEditText.getText().removeSpan(finalGrayColorSpan);
} else { // The user has stopped editing the URL text box.
// Move to the beginning of the string.
- urlTextBox.setSelection(0);
+ urlEditText.setSelection(0);
// Reapply the highlighting.
highlightUrlText();
});
// Set the go button on the keyboard to load the URL in `urlTextBox`.
- urlTextBox.setOnKeyListener((View v, int keyCode, KeyEvent event) -> {
+ urlEditText.setOnKeyListener((View v, int keyCode, KeyEvent event) -> {
// If the event is a key-down event on the `enter` button, load the URL.
if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) {
// Load the URL into the mainWebView and consume the event.
// Get the current WebView fragment. Instantiate item returns the current item if it already exists.
Fragment webViewFragment = (Fragment) webViewPagerAdapter.instantiateItem(webViewPager, position);
+ // Remove the lint error below that the WebView fragment might be null.
+ assert webViewFragment.getView() != null;
+
// Store the current WebView.
- currentWebView = (NestedScrollWebView) webViewFragment.getView();
+ currentWebView = webViewFragment.getView().findViewById(R.id.nestedscroll_webview);
+
+ // Store the current formatted URL string.
+ formattedUrlString = currentWebView.getUrl();
+
+ // Clear the focus from the URL text box.
+ urlEditText.clearFocus();
+
+ // Hide the soft keyboard.
+ inputMethodManager.hideSoftInputFromWindow(currentWebView.getWindowToken(), 0);
+
+ // Apply the current URL in the URL text box.
+ urlEditText.setText(formattedUrlString);
+
+ // Highlight the URL text.
+ highlightUrlText();
+
+ // Set the background to indicate the domain settings status.
+ if (currentWebView.getDomainSettingsApplied()) {
+ // Set a green background on `urlTextBox` to indicate that custom domain settings are being used. The deprecated `.getDrawable()` must be used until the minimum API >= 21.
+ if (darkTheme) {
+ urlEditText.setBackground(getResources().getDrawable(R.drawable.url_bar_background_dark_blue));
+ } else {
+ urlEditText.setBackground(getResources().getDrawable(R.drawable.url_bar_background_light_green));
+ }
+ } else {
+ urlEditText.setBackgroundDrawable(getResources().getDrawable(R.color.transparent));
+ }
// Select the corresponding tab if it does not match the currently selected page. This will happen if the page was scrolled via swiping in the view pager.
if (tabLayout.getSelectedTabPosition() != position) {
// Set the `check mark` button for the `findOnPageEditText` keyboard to close the soft keyboard.
findOnPageEditText.setOnKeyListener((v, keyCode, event) -> {
if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) { // The `enter` key was pressed.
- // Hide the soft keyboard. `0` indicates no additional flags.
+ // Hide the soft keyboard.
inputMethodManager.hideSoftInputFromWindow(currentWebView.getWindowToken(), 0);
// Consume the event.
// Set the swipe to refresh color according to the theme.
if (darkTheme) {
- swipeRefreshLayout.setColorSchemeResources(R.color.blue_600);
+ swipeRefreshLayout.setColorSchemeResources(R.color.blue_800);
swipeRefreshLayout.setProgressBackgroundColorSchemeResource(R.color.gray_850);
} else {
- swipeRefreshLayout.setColorSchemeResources(R.color.blue_700);
+ swipeRefreshLayout.setColorSchemeResources(R.color.blue_500);
}
// `DrawerTitle` identifies the `DrawerLayouts` in accessibility mode.
inputMethodManager.hideSoftInputFromWindow(currentWebView.getWindowToken(), 0);
// Clear the focus from from the URL text box and the WebView. This removes any text selection markers and context menus, which otherwise draw above the open drawers.
- urlTextBox.clearFocus();
+ urlEditText.clearFocus();
currentWebView.clearFocus();
}
}
MenuItem proxyThroughOrbotMenuItem = menu.findItem(R.id.proxy_through_orbot);
// Set the text for the domain menu item.
- if (domainSettingsApplied) {
+ if (currentWebView.getDomainSettingsApplied()) {
addOrEditDomain.setTitle(R.string.edit_domain_settings);
} else {
addOrEditDomain.setTitle(R.string.add_domain_settings);
return true;
case R.id.add_or_edit_domain:
- if (domainSettingsApplied) { // Edit the current domain settings.
+ if (currentWebView.getDomainSettingsApplied()) { // Edit the current domain settings.
// Reapply the domain settings on returning to `MainWebViewActivity`.
reapplyDomainSettingsOnRestart = true;
currentDomainName = "";
Intent domainsIntent = new Intent(this, DomainsActivity.class);
// Put extra information instructing the domains activity to directly load the current domain and close on back instead of returning to the domains list.
- domainsIntent.putExtra("loadDomain", domainSettingsDatabaseId);
+ domainsIntent.putExtra("loadDomain", currentWebView.getDomainSettingsDatabaseId());
domainsIntent.putExtra("closeOnBack", true);
// Make it so.
if (nightMode) { // Night mode is enabled. Enable JavaScript.
// Update the global variable.
javaScriptEnabled = true;
- } else if (domainSettingsApplied) { // Night mode is disabled and domain settings are applied. Set JavaScript according to the domain settings.
+ } else if (currentWebView.getDomainSettingsApplied()) { // Night mode is disabled and domain settings are applied. Set JavaScript according to the domain settings.
// Get the JavaScript preference that was stored the last time domain settings were loaded.
javaScriptEnabled = domainSettingsJavaScriptEnabled;
} else { // Night mode is disabled and domain settings are not applied. Set JavaScript according to the global preference.
case R.id.share_url:
// Setup the share string.
- String shareString = webViewTitle + " – " + urlTextBox.getText().toString();
+ String shareString = webViewTitle + " – " + formattedUrlString;
// Create the share intent.
Intent shareIntent = new Intent(Intent.ACTION_SEND);
}
private void loadUrlFromTextBox() {
+ // Get a handle for the URL edit text.
+ EditText urlEditText = findViewById(R.id.url_edittext);
+
// Get the text from urlTextBox and convert it to a string. trim() removes white spaces from the beginning and end of the string.
- String unformattedUrlString = urlTextBox.getText().toString().trim();
+ String unformattedUrlString = urlEditText.getText().toString().trim();
// Check to see if `unformattedUrlString` is a valid URL. Otherwise, convert it into a search.
if (unformattedUrlString.startsWith("content://")) {
formattedUrlString = searchURL + encodedUrlString;
}
- // Clear the focus from the URL text box. Otherwise, proximate typing in the box will retain the colorized formatting instead of being reset during refocus.
- urlTextBox.clearFocus();
+ // Clear the focus from the URL edit text. Otherwise, proximate typing in the box will retain the colorized formatting instead of being reset during refocus.
+ urlEditText.clearFocus();
// Make it so.
loadUrl(formattedUrlString);
// Close `domainNameCursor.
domainNameCursor.close();
- // Initialize variables to track if domain settings will be applied and, if so, under which name.
- domainSettingsApplied = false;
+ // Initialize the domain name in database variable.
String domainNameInDatabase = null;
- // Check the hostname.
- if (domainSettingsSet.contains(hostName)) {
- domainSettingsApplied = true;
+ // Check the hostname against the domain settings set.
+ if (domainSettingsSet.contains(hostName)) { // The hostname is contained in the domain settings set.
+ // Record the domain name in the database.
domainNameInDatabase = hostName;
+
+ // Set the domain settings applied tracker to true.
+ currentWebView.setDomainSettingsApplied(true);
+ } else { // The hostname is not contained in the domain settings set.
+ // Set the domain settings applied tracker to false.
+ currentWebView.setDomainSettingsApplied(false);
}
// Check all the subdomains of the host name against wildcard domains in the domain cursor.
- while (!domainSettingsApplied && hostName.contains(".")) { // Stop checking if domain settings are already applied or there are no more `.` in the host name.
+ while (!currentWebView.getDomainSettingsApplied() && hostName.contains(".")) { // Stop checking if domain settings are already applied or there are no more `.` in the host name.
if (domainSettingsSet.contains("*." + hostName)) { // Check the host name prepended by `*.`.
- // Apply the domain settings.
- domainSettingsApplied = true;
+ // Set the domain settings applied tracker to true.
+ currentWebView.setDomainSettingsApplied(true);
// Store the applied domain names as it appears in the database.
domainNameInDatabase = "*." + hostName;
nightMode = sharedPreferences.getBoolean("night_mode", false);
boolean displayWebpageImages = sharedPreferences.getBoolean("display_webpage_images", true);
- if (domainSettingsApplied) { // The url has custom domain settings.
+ if (currentWebView.getDomainSettingsApplied()) { // The url has custom domain settings.
// Get a cursor for the current host and move it to the first position.
Cursor currentHostDomainSettingsCursor = domainsDatabaseHelper.getCursorForDomainName(domainNameInDatabase);
currentHostDomainSettingsCursor.moveToFirst();
// Get the settings from the cursor.
- domainSettingsDatabaseId = (currentHostDomainSettingsCursor.getInt(currentHostDomainSettingsCursor.getColumnIndex(DomainsDatabaseHelper._ID)));
+ currentWebView.setDomainSettingsDatabaseId(currentHostDomainSettingsCursor.getInt(currentHostDomainSettingsCursor.getColumnIndex(DomainsDatabaseHelper._ID)));
javaScriptEnabled = (currentHostDomainSettingsCursor.getInt(currentHostDomainSettingsCursor.getColumnIndex(DomainsDatabaseHelper.ENABLE_JAVASCRIPT)) == 1);
firstPartyCookiesEnabled = (currentHostDomainSettingsCursor.getInt(currentHostDomainSettingsCursor.getColumnIndex(DomainsDatabaseHelper.ENABLE_FIRST_PARTY_COOKIES)) == 1);
thirdPartyCookiesEnabled = (currentHostDomainSettingsCursor.getInt(currentHostDomainSettingsCursor.getColumnIndex(DomainsDatabaseHelper.ENABLE_THIRD_PARTY_COOKIES)) == 1);
break;
}
- // Set a green background on `urlTextBox` to indicate that custom domain settings are being used. We have to use the deprecated `.getDrawable()` until the minimum API >= 21.
+ // Set a green background on URL edit text to indicate that custom domain settings are being used. The deprecated `.getDrawable()` must be used until the minimum API >= 21.
if (darkTheme) {
urlEditText.setBackground(getResources().getDrawable(R.drawable.url_bar_background_dark_blue));
} else {
}
// Reset the pinned variables.
- domainSettingsDatabaseId = -1;
+ currentWebView.setDomainSettingsDatabaseId(-1);
pinnedSslCertificate = false;
pinnedSslIssuedToCName = "";
pinnedSslIssuedToOName = "";
// Set the loading of webpage images.
currentWebView.getSettings().setLoadsImagesAutomatically(displayWebpageImages);
- // Set a transparent background on `urlTextBox`. The deprecated `.getDrawable()` must be used until the minimum API >= 21.
+ // Set a transparent background on URL edit text. The deprecated `.getDrawable()` must be used until the minimum API >= 21.
urlEditText.setBackgroundDrawable(getResources().getDrawable(R.color.transparent));
}
}
private void highlightUrlText() {
+ // Get a handle for the URL edit text.
+ EditText urlEditText = findViewById(R.id.url_edittext);
+
// Only highlight the URL text if the box is not currently selected.
- if (!urlTextBox.hasFocus()) {
+ if (!urlEditText.hasFocus()) {
// Get the URL string.
- String urlString = urlTextBox.getText().toString();
+ String urlString = urlEditText.getText().toString();
// Highlight the URL according to the protocol.
if (urlString.startsWith("file://")) { // This is a file URL.
// De-emphasize only the protocol.
- urlTextBox.getText().setSpan(initialGrayColorSpan, 0, 7, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+ urlEditText.getText().setSpan(initialGrayColorSpan, 0, 7, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
} else if (urlString.startsWith("content://")) {
// De-emphasize only the protocol.
- urlTextBox.getText().setSpan(initialGrayColorSpan, 0, 10, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+ urlEditText.getText().setSpan(initialGrayColorSpan, 0, 10, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
} else { // This is a web URL.
// Get the index of the `/` immediately after the domain name.
int endOfDomainName = urlString.indexOf("/", (urlString.indexOf("//") + 2));
// Markup the beginning of the URL.
if (urlString.startsWith("http://")) { // Highlight the protocol of connections that are not encrypted.
- urlTextBox.getText().setSpan(redColorSpan, 0, 7, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+ urlEditText.getText().setSpan(redColorSpan, 0, 7, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
// De-emphasize subdomains.
if (penultimateDotIndex > 0) { // There is more than one subdomain in the domain name.
- urlTextBox.getText().setSpan(initialGrayColorSpan, 7, penultimateDotIndex + 1, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+ urlEditText.getText().setSpan(initialGrayColorSpan, 7, penultimateDotIndex + 1, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
}
} else if (urlString.startsWith("https://")) { // De-emphasize the protocol of connections that are encrypted.
if (penultimateDotIndex > 0) { // There is more than one subdomain in the domain name.
// De-emphasize the protocol and the additional subdomains.
- urlTextBox.getText().setSpan(initialGrayColorSpan, 0, penultimateDotIndex + 1, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+ urlEditText.getText().setSpan(initialGrayColorSpan, 0, penultimateDotIndex + 1, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
} else { // There is only one subdomain in the domain name.
// De-emphasize only the protocol.
- urlTextBox.getText().setSpan(initialGrayColorSpan, 0, 8, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+ urlEditText.getText().setSpan(initialGrayColorSpan, 0, 8, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
}
}
// De-emphasize the text after the domain name.
if (endOfDomainName > 0) {
- urlTextBox.getText().setSpan(finalGrayColorSpan, endOfDomainName, urlString.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+ urlEditText.getText().setSpan(finalGrayColorSpan, endOfDomainName, urlString.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
}
}
}
startActivity(openWithBrowserIntent);
}
- private static void checkPinnedMismatch() {
+ public static void checkPinnedMismatch(int domainSettingsDatabaseId) {
if ((pinnedSslCertificate || pinnedIpAddresses) && !ignorePinnedDomainInformation) {
// Initialize the current SSL certificate variables.
String currentWebsiteIssuedToCName = "";
!currentWebsiteSslEndDateString.equals(pinnedSslEndDateString)))) {
// Get a handle for the pinned mismatch alert dialog.
- DialogFragment pinnedMismatchDialogFragment = PinnedMismatchDialog.displayDialog(pinnedSslCertificate, pinnedIpAddresses);
+ DialogFragment pinnedMismatchDialogFragment = PinnedMismatchDialog.displayDialog(domainSettingsDatabaseId, pinnedSslCertificate, pinnedIpAddresses);
// Show the pinned mismatch alert dialog.
pinnedMismatchDialogFragment.show(fragmentManager, "Pinned Mismatch");
}
}
- // This must run asynchronously because it involves a network request. `String` declares the parameters. `Void` does not declare progress units. `String` contains the results.
- private static class GetHostIpAddresses extends AsyncTask<String, Void, String> {
- // The weak references are used to determine if the activity have disappeared while the AsyncTask is running.
- private final WeakReference<Activity> activityWeakReference;
-
- GetHostIpAddresses(Activity activity) {
- // Populate the weak references.
- activityWeakReference = new WeakReference<>(activity);
- }
-
- // `onPreExecute()` operates on the UI thread.
- @Override
- protected void onPreExecute() {
- // Get a handle for the activity.
- Activity activity = activityWeakReference.get();
-
- // Abort if the activity is gone.
- if ((activity == null) || activity.isFinishing()) {
- return;
- }
-
- // Set the getting IP addresses tracker.
- gettingIpAddresses = true;
- }
-
-
- @Override
- protected String doInBackground(String... domainName) {
- // Get a handle for the activity.
- Activity activity = activityWeakReference.get();
-
- // Abort if the activity is gone.
- if ((activity == null) || activity.isFinishing()) {
- // Return an empty spannable string builder.
- return "";
- }
-
- // Initialize an IP address string builder.
- StringBuilder ipAddresses = new StringBuilder();
-
- // Get an array with the IP addresses for the host.
- try {
- // Get an array with all the IP addresses for the domain.
- InetAddress[] inetAddressesArray = InetAddress.getAllByName(domainName[0]);
-
- // Add each IP address to the string builder.
- for (InetAddress inetAddress : inetAddressesArray) {
- if (ipAddresses.length() == 0) { // This is the first IP address.
- // Add the IP address to the string builder.
- ipAddresses.append(inetAddress.getHostAddress());
- } else { // This is not the first IP address.
- // Add a line break to the string builder first.
- ipAddresses.append("\n");
-
- // Add the IP address to the string builder.
- ipAddresses.append(inetAddress.getHostAddress());
- }
- }
- } catch (UnknownHostException exception) {
- // Do nothing.
- }
-
- // Return the string.
- return ipAddresses.toString();
- }
-
- // `onPostExecute()` operates on the UI thread.
- @Override
- protected void onPostExecute(String ipAddresses) {
- // Get a handle for the activity.
- Activity activity = activityWeakReference.get();
-
- // Abort if the activity is gone.
- if ((activity == null) || activity.isFinishing()) {
- return;
- }
-
- // Store the IP addresses.
- currentHostIpAddresses = ipAddresses;
-
- if (!urlIsLoading) {
- checkPinnedMismatch();
- }
-
- // Reset the getting IP addresses tracker.
- gettingIpAddresses = false;
- }
- }
-
private class WebViewPagerAdapter extends FragmentPagerAdapter {
// The WebView fragments list contains all the WebViews.
private LinkedList<WebViewTabFragment> webViewFragmentsList = new LinkedList<>();
}
@Override
- public void initializeWebView(NestedScrollWebView nestedScrollWebView, int tabNumber) {
+ public void initializeWebView(int tabNumber, ProgressBar progressBar, NestedScrollWebView nestedScrollWebView) {
// Get handles for the activity views.
final FrameLayout rootFrameLayout = findViewById(R.id.root_framelayout);
final DrawerLayout drawerLayout = findViewById(R.id.drawerlayout);
final RelativeLayout mainContentRelativeLayout = findViewById(R.id.main_content_relativelayout);
final ActionBar actionBar = getSupportActionBar();
+ EditText urlEditText = findViewById(R.id.url_edittext);
final TabLayout tabLayout = findViewById(R.id.tablayout);
final SwipeRefreshLayout swipeRefreshLayout = findViewById(R.id.swiperefreshlayout);
ImageView tabFavoriteIconImageView = currentTabView.findViewById(R.id.favorite_icon_imageview);
TextView tabTitleTextView = currentTabView.findViewById(R.id.title_textview);
-
- //TODO
- final ProgressBar progressBar = findViewById(R.id.progress_bar);
-
// Get a handle for the shared preferences.
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
formattedUrlString = url;
// Display the formatted URL text.
- urlTextBox.setText(formattedUrlString);
+ urlEditText.setText(formattedUrlString);
// Apply text highlighting to `urlTextBox`.
highlightUrlText();
Uri currentUri = Uri.parse(formattedUrlString);
// Get the IP addresses for the host.
- new GetHostIpAddresses(activity).execute(currentUri.getHost());
+ new GetHostIpAddresses(activity, currentWebView.getDomainSettingsDatabaseId()).execute(currentUri.getHost());
// Apply any custom domain settings if the URL was loaded by navigating history.
if (navigatingHistory) {
// Set `formattedUrlString` to `""`.
formattedUrlString = "";
- urlTextBox.setText(formattedUrlString);
+ urlEditText.setText(formattedUrlString);
// Request focus for `urlTextBox`.
- urlTextBox.requestFocus();
+ urlEditText.requestFocus();
// Display the keyboard.
- inputMethodManager.showSoftInput(urlTextBox, 0);
+ inputMethodManager.showSoftInput(urlEditText, 0);
// Apply the domain settings. This clears any settings from the previous domain.
applyDomainSettings(formattedUrlString, true, false);
formattedUrlString = nestedScrollWebView.getUrl();
// Only update the URL text box if the user is not typing in it.
- if (!urlTextBox.hasFocus()) {
+ if (!urlEditText.hasFocus()) {
// Display the formatted URL text.
- urlTextBox.setText(formattedUrlString);
+ urlEditText.setText(formattedUrlString);
// Apply text highlighting to `urlTextBox`.
highlightUrlText();
// Check the current website information against any pinned domain information if the current IP addresses have been loaded.
if (!gettingIpAddresses) {
- checkPinnedMismatch();
+ checkPinnedMismatch(currentWebView.getDomainSettingsDatabaseId());
}
}
projects / PrivacyBrowserAndroid.git / blobdiff