MenuItem selectedFontSizeMenuItem;
// Prepare the font size title and current size menu item.
+ //noinspection DuplicateBranchesInSwitch
switch (fontSize) {
case 25:
fontSizeTitle = getString(R.string.font_size) + " - " + getString(R.string.twenty_five_percent);
// Get the previous entry URL.
String previousUrl = webBackForwardList.getItemAtIndex(webBackForwardList.getCurrentIndex() - 1).getUrl();
- // Reset the current domain name so that navigation works if third-party requests are blocked.
- currentWebView.resetCurrentDomainName();
-
// Apply the domain settings.
applyDomainSettings(currentWebView, previousUrl, false, false);
// Get the next entry URL.
String nextUrl = webBackForwardList.getItemAtIndex(webBackForwardList.getCurrentIndex() + 1).getUrl();
- // Reset the current domain name so that navigation works if third-party requests are blocked.
- currentWebView.resetCurrentDomainName();
-
// Apply the domain settings.
applyDomainSettings(currentWebView, nextUrl, false, false);
// Get the previous entry URL.
String previousUrl = webBackForwardList.getItemAtIndex(webBackForwardList.getCurrentIndex() - 1).getUrl();
- // Reset the current domain name so that navigation works if third-party requests are blocked.
- currentWebView.resetCurrentDomainName();
-
// Apply the domain settings.
applyDomainSettings(currentWebView, previousUrl, false, false);
// Close the current tab.
closeCurrentTab();
} else { // There isn't anything to do in Privacy Browser.
- // Run the default commands.
- super.onBackPressed();
+ // Close Privacy Browser. `finishAndRemoveTask()` also removes Privacy Browser from the recent app list.
+ if (Build.VERSION.SDK_INT >= 21) {
+ finishAndRemoveTask();
+ } else {
+ finish();
+ }
// Manually kill Privacy Browser. Otherwise, it is glitchy when restarted.
System.exit(0);
// Instantiate the file name helper.
FileNameHelper fileNameHelper = new FileNameHelper();
- // Convert the file name URI to a file name path.
- String fileNamePath = fileNameHelper.convertUriToFileNamePath(data.getData());
+ // Get the file path if it isn't null.
+ if (data.getData() != null) {
+ // Convert the file name URI to a file name path.
+ String fileNamePath = fileNameHelper.convertUriToFileNamePath(data.getData());
- // Set the file name path as the text of the file name edit text.
- fileNameEditText.setText(fileNamePath);
+ // Set the file name path as the text of the file name edit text.
+ fileNameEditText.setText(fileNamePath);
+ }
}
}
break;
@Override
public void navigateHistory(String url, int steps) {
- // Reset the current domain name so that navigation works if third-party requests are blocked.
- currentWebView.resetCurrentDomainName();
-
// Apply the domain settings.
applyDomainSettings(currentWebView, url, false, false);
// Get the previous entry URL.
String previousUrl = webBackForwardList.getItemAtIndex(webBackForwardList.getCurrentIndex() - 1).getUrl();
- // Reset the current domain name so that navigation works if third-party requests are blocked.
- currentWebView.resetCurrentDomainName();
-
// Apply the domain settings.
applyDomainSettings(currentWebView, previousUrl, false, false);