import android.content.res.Configuration;
import android.database.Cursor;
import android.graphics.Bitmap;
+import android.graphics.Typeface;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.support.v7.app.AppCompatDialogFragment;
import android.support.v7.widget.Toolbar;
import android.text.Editable;
+import android.text.Spanned;
import android.text.TextWatcher;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.StyleSpan;
import android.util.Patterns;
import android.view.ContextMenu;
import android.view.GestureDetector;
// `webViewTitle` is public static so it can be accessed from `CreateBookmarkDialog` and `CreateHomeScreenShortcutDialog`. It is also used in `onCreate()`.
public static String webViewTitle;
- // `displayWebpageImagesBoolean` is public static so it can be accessed from `DomainSettingsFragment`. It is also used in `applyAppSettings` and `applyDomainSettings()`.
+ // `displayWebpageImagesBoolean` is public static so it can be accessed from `DomainSettingsFragment`. It is also used in `applyAppSettings()` and `applyDomainSettings()`.
public static boolean displayWebpageImagesBoolean;
+ // `reloadOnRestartBoolean` is public static so it can be accessed from `SettingsFragment`. It is also used in `onRestart()`
+ public static boolean reloadOnRestartBoolean;
+
// `navigatingHistory` is used in `onCreate()`, `onNavigationItemSelected()`, and `applyDomainSettings()`.
private boolean navigatingHistory;
// `onTheFlyDisplayImagesSet` is used in `applyDomainSettings()` and `setDisplayWebpageImages()`.
private boolean onTheFlyDisplayImagesSet;
- // `loadingNewIntentBoolean` is used in `onNewIntent()` and `onRestart()`.
- private boolean loadingNewIntentBoolean;
-
// `waitingForOrbotData` is used in `onCreate()` and `applyAppSettings()`.
private String waitingForOrbotHTMLString;
// `supportAppBar` is used in `onCreate()`, `onOptionsItemSelected()`, and `closeFindOnPage()`.
private Toolbar supportAppBar;
- // `urlTextBox` is used in `onCreate()`, `onOptionsItemSelected()`, `loadUrlFromTextBox()`, and `loadUrl()`.
+ // `urlTextBox` is used in `onCreate()`, `onOptionsItemSelected()`, `loadUrlFromTextBox()`, `loadUrl()`, and `highlightUrlText()`.
private EditText urlTextBox;
+ // `redColorSpan` is used in `onCreate()` and `highlightUrlText()`.
+ private ForegroundColorSpan redColorSpan;
+
+ // `initialGrayColorSpan` is sued in `onCreate()` and `highlightUrlText()`.
+ private ForegroundColorSpan initialGrayColorSpan;
+
+ // `finalGrayColorSpam` is used in `onCreate()` and `highlightUrlText()`.
+ private ForegroundColorSpan finalGrayColorSpan;
+
+ // `boldStyleSpan` is used in `onCreate()` and `highlightUrlText()`.
+ private StyleSpan boldStyleSpan;
+
// `adView` is used in `onCreate()` and `onConfigurationChanged()`.
private View adView;
@Override
// Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled. The whole premise of Privacy Browser is built around an understanding of these dangers.
@SuppressLint("SetJavaScriptEnabled")
+ // Remove Android Studio's warning about deprecations. We have to use the deprecated `getColor()` until API >= 23.
+ @SuppressWarnings("deprecation")
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main_drawerlayout);
appBar.setCustomView(R.layout.url_app_bar);
appBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
- // Set the "go" button on the keyboard to load the URL in urlTextBox.
+ // Initialize the `ForegroundColorSpans` and `StyleSpan` for highlighting `urlTextBox`. We have to use the deprecated `getColor()` until API >= 23.
+ redColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.red_a700));
+ initialGrayColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.gray_500));
+ finalGrayColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.gray_500));
+ boldStyleSpan = new StyleSpan(Typeface.BOLD);
+
+ // Get a handle for `urlTextBox`.
urlTextBox = (EditText) appBar.getCustomView().findViewById(R.id.url_edittext);
+
+ // Remove the formatting from `urlTextBar` when the user is editing the text.
+ urlTextBox.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+ if (hasFocus) { // The user is editing `urlTextBox`.
+ // Remove the highlighting.
+ urlTextBox.getText().removeSpan(redColorSpan);
+ urlTextBox.getText().removeSpan(initialGrayColorSpan);
+ urlTextBox.getText().removeSpan(finalGrayColorSpan);
+ urlTextBox.getText().removeSpan(boldStyleSpan);
+ } else { // The user has stopped editing `urlTextBox`.
+ // Reapply the highlighting.
+ highlightUrlText();
+
+ // Scroll to the beginning of the text.
+ urlTextBox.setScrollX(0);
+ }
+ }
+ });
+
+ // Set the `Go` button on the keyboard to load the URL in `urlTextBox`.
urlTextBox.setOnKeyListener(new View.OnKeyListener() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
navigationForwardMenuItem.setEnabled(mainWebView.canGoForward());
navigationHistoryMenuItem.setEnabled((mainWebView.canGoBack() || mainWebView.canGoForward()));
- // Hide the keyboard so we can see the navigation menu. `0` indicates no additional flags.
+ // Hide the keyboard (if displayed) so we can see the navigation menu. `0` indicates no additional flags.
inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0);
+
+ // Clear the focus from `urlTextBox` if it has it.
+ urlTextBox.clearFocus();
}
}
});
// We need to update `formattedUrlString` at the beginning of the load, so that if the user toggles JavaScript during the load the new website is reloaded.
formattedUrlString = url;
- // Display the loading URL is the URL text box.
- urlTextBox.setText(url);
+ // Display the formatted URL text.
+ urlTextBox.setText(formattedUrlString);
+
+ // Apply text highlighting to `urlTextBox`.
+ highlightUrlText();
// Apply any custom domain settings if the URL was loaded by navigating history.
if (navigatingHistory) {
// Set `formattedUrlString` to `""`.
formattedUrlString = "";
- // Update `urlTextBox`.
urlTextBox.setText(formattedUrlString);
// Request focus for `urlTextBox`.
// Display the keyboard.
inputMethodManager.showSoftInput(urlTextBox, 0);
- // Apply the domain settings.
+ // Apply the domain settings. This clears any settings from the previous domain.
applyDomainSettings(formattedUrlString);
} else { // `WebView` has loaded a webpage.
// Set `formattedUrlString`.
// Only update `urlTextBox` if the user is not typing in it.
if (!urlTextBox.hasFocus()) {
+ // Display the formatted URL text.
urlTextBox.setText(formattedUrlString);
+
+ // Apply text highlighting to `urlTextBox`.
+ highlightUrlText();
}
}
@Override
protected void onNewIntent(Intent intent) {
- // Set `loadingNewIntentBoolean`.
- loadingNewIntentBoolean = true;
-
// Sets the new intent as the activity intent, so that any future `getIntent()`s pick up this one instead of creating a new activity.
setIntent(intent);
// Set the display webpage images mode.
setDisplayWebpageImages();
- // Only reload `mainWebView` if not loading a new intent and not waiting for Orbot.
- if (!loadingNewIntentBoolean && !waitingForOrbot) {
- // Reload the webpage to remove images if `setDisplayWebpageImages` has turned them off.
+ // Reload the webpage if displaying of images has been disabled in `SettingsFragment`.
+ if (reloadOnRestartBoolean) {
+ // Reload `mainWebView`.
mainWebView.reload();
- } else if (loadingNewIntentBoolean) { // Reset `loadingNewIntentBoolean` if this run comes from a new intent.
- loadingNewIntentBoolean = false;
+
+ // Reset `reloadOnRestartBoolean`.
+ reloadOnRestartBoolean = false;
}
}
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
+ // Hide the keyboard (if displayed) so we can see the options menu. `0` indicates no additional flags.
+ inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0);
+
// Get handles for the menu items.
MenuItem toggleFirstPartyCookiesMenuItem = menu.findItem(R.id.toggle_first_party_cookies);
MenuItem toggleThirdPartyCookiesMenuItem = menu.findItem(R.id.toggle_third_party_cookies);
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
// Store the values from `sharedPreferences` in variables.
- String homepageString = sharedPreferences.getString("homepage", "https://duckduckgo.com");
+ String homepageString = sharedPreferences.getString("homepage", "https://start.duckduckgo.com");
String torHomepageString = sharedPreferences.getString("tor_homepage", "https://3g2upl4pq6kufc4m.onion");
String torSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
String torSearchCustomURLString = sharedPreferences.getString("tor_search_custom_url", "");
ActivityCompat.invalidateOptionsMenu(this);
}
}
+
+ private void highlightUrlText() {
+ String urlString = urlTextBox.getText().toString();
+
+ if (urlString.startsWith("http://")) { // Highlight connections that are not encrypted.
+ urlTextBox.getText().setSpan(redColorSpan, 0, 7, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+ urlTextBox.getText().setSpan(boldStyleSpan, 0, 7, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+ } else if (urlString.startsWith("https://")) { // Highlight connections that are encrypted.
+ urlTextBox.getText().setSpan(initialGrayColorSpan, 0, 8, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+ }
+
+ // Get the index of the `/` immediately after the domain name.
+ int endOfDomainName = urlString.indexOf("/", (urlString.indexOf("//") + 2));
+
+ // De-emphasize the text after the domain name.
+ if (endOfDomainName > 0) {
+ urlTextBox.getText().setSpan(finalGrayColorSpan, endOfDomainName, urlString.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+ }
+ }
}
projects / PrivacyBrowserAndroid.git / blobdiff