import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
+import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
// mainWebView is public static so it can be accessed from AboutDialog. It is also used in onCreate(), onOptionsItemSelected(), and loadUrlFromTextBox().
public static WebView mainWebView;
+ // mainMenu is used in onCreateOptionsMenu() and onOptionsItemSelected().
+ private Menu mainMenu;
// formattedUrlString is used in onCreate(), onOptionsItemSelected(), onCreateHomeScreenShortcutCreate(), and loadUrlFromTextBox().
private String formattedUrlString;
// homepage is used in onCreate() and onOptionsItemSelected().
- private String homepage = "https://www.duckduckgo.com/";
+ private String homepage;
// javaScriptEnabled is used in onCreate(), onCreateOptionsMenu(), onOptionsItemSelected(), and loadUrlFromTextBox().
private boolean javaScriptEnabled;
// domStorageEnabled is used in onCreate(), onCreateOptionsMenu(), and onOptionsItemSelected().
mainWebView.getSettings().setDisplayZoomControls(false);
}
+ // Initialize the default preference values the first time the program is run.
+ PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
+
+ // Get the shared preference values.
+ SharedPreferences savedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+
// Set JavaScript initial status.
- javaScriptEnabled = false;
+ javaScriptEnabled = savedPreferences.getBoolean("javascript_enabled", false);
mainWebView.getSettings().setJavaScriptEnabled(javaScriptEnabled);
- // Set DOM Storage initial status.
- domStorageEnabled = false;
+ // Set DOM storage initial status.
+ domStorageEnabled = savedPreferences.getBoolean("dom_storage_enabled", false);
mainWebView.getSettings().setDomStorageEnabled(domStorageEnabled);
/* Save Form Data does nothing until database storage is implemented.
mainWebView.getSettings().setSaveFormData(saveFormDataEnabled);
*/
- // Set Cookies initial status.
- cookiesEnabled = false;
+ // Set cookies initial status.
+ cookiesEnabled = savedPreferences.getBoolean("cookies_enabled", false);
cookieManager = CookieManager.getInstance();
cookieManager.setAcceptCookie(cookiesEnabled);
+ // Set hompage initial status.
+ homepage = savedPreferences.getString("homepage", "https://www.duckduckgo.com");
+
// Get the intent information that started the app.
final Intent intent = getIntent();
@Override
protected void onNewIntent(Intent intent) {
- // Sets the new intent as the activity intent, so that any future getIntent() picks up this one.
+ // 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);
if (intent.getData() != null) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.menu_webview, menu);
+ // Set mainMenu so it can be used by onOptionsItemSelected.
+ mainMenu = menu;
+
// Get MenuItems for checkable menu items.
MenuItem toggleJavaScript = menu.findItem(R.id.toggleJavaScript);
MenuItem toggleDomStorage = menu.findItem(R.id.toggleDomStorage);
// Set the initial icon for toggleJavaScript
if (javaScriptEnabled) {
- toggleJavaScript.setIcon(R.drawable.javascript_on);
+ toggleJavaScript.setIcon(R.drawable.javascript_enabled);
} else {
- toggleJavaScript.setIcon(R.drawable.javascript_off);
+ if (domStorageEnabled || cookiesEnabled) {
+ toggleJavaScript.setIcon(R.drawable.warning);
+ } else {
+ toggleJavaScript.setIcon(R.drawable.privacy_mode);
+ }
}
// Set the initial status of the menu item checkboxes.
@SuppressWarnings("deprecation")
public boolean onOptionsItemSelected(MenuItem menuItem) {
int menuItemId = menuItem.getItemId();
+
+ // Some options need to access the clipboard.
ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+ // Some options need to update the drawable for toggleJavaScript.
+ MenuItem toggleJavaScript = mainMenu.findItem(R.id.toggleJavaScript);
+
// Sets the commands that relate to the menu entries.
switch (menuItemId) {
case R.id.toggleJavaScript:
if (javaScriptEnabled) {
javaScriptEnabled = false;
- menuItem.setIcon(R.drawable.javascript_off);
mainWebView.getSettings().setJavaScriptEnabled(false);
mainWebView.reload();
- Toast.makeText(getApplicationContext(), "JavaScript Disabled", Toast.LENGTH_SHORT).show();
+
+ // Update the toggleJavaScript icon and display a toast message.
+ if (domStorageEnabled || cookiesEnabled) {
+ menuItem.setIcon(R.drawable.warning);
+ if (domStorageEnabled && cookiesEnabled) {
+ Toast.makeText(getApplicationContext(), "JavaScript disabled, DOM Storage and Cookies still enabled", Toast.LENGTH_SHORT).show();
+ } else {
+ if (domStorageEnabled) {
+ Toast.makeText(getApplicationContext(), "JavaScript disabled, DOM Storage still enabled", Toast.LENGTH_SHORT).show();
+ } else {
+ Toast.makeText(getApplicationContext(), "JavaScript disabled, Cookies still enabled", Toast.LENGTH_SHORT).show();
+ }
+ }
+ } else {
+ menuItem.setIcon(R.drawable.privacy_mode);
+ Toast.makeText(getApplicationContext(), "Privacy Mode", Toast.LENGTH_SHORT).show();
+ }
} else {
javaScriptEnabled = true;
- menuItem.setIcon(R.drawable.javascript_on);
+ menuItem.setIcon(R.drawable.javascript_enabled);
mainWebView.getSettings().setJavaScriptEnabled(true);
mainWebView.reload();
- Toast.makeText(getApplicationContext(), "JavaScript Enabled", Toast.LENGTH_SHORT).show();
+ Toast.makeText(getApplicationContext(), "JavaScript enabled", Toast.LENGTH_SHORT).show();
}
return true;
menuItem.setChecked(false);
mainWebView.getSettings().setDomStorageEnabled(false);
mainWebView.reload();
+
+ // Update the toggleJavaScript icon and display a toast message if appropriate.
+ if (!javaScriptEnabled && !cookiesEnabled) {
+ toggleJavaScript.setIcon(R.drawable.privacy_mode);
+ Toast.makeText(getApplicationContext(), "Privacy Mode", Toast.LENGTH_SHORT).show();
+ } else {
+ if (cookiesEnabled) {
+ toggleJavaScript.setIcon(R.drawable.warning);
+ Toast.makeText(getApplicationContext(), "Cookies still enabled", Toast.LENGTH_SHORT).show();
+ } // Else Do nothing because JavaScript is enabled.
+ }
} else {
domStorageEnabled = true;
menuItem.setChecked(true);
mainWebView.getSettings().setDomStorageEnabled(true);
mainWebView.reload();
+
+ // Update the toggleJavaScript icon if appropriate.
+ if (!javaScriptEnabled) {
+ toggleJavaScript.setIcon(R.drawable.warning);
+ } // Else Do nothing because JavaScript is enabled.
+
+ Toast.makeText(getApplicationContext(), "DOM Storage enabled", Toast.LENGTH_SHORT).show();
}
return true;
menuItem.setChecked(false);
cookieManager.setAcceptCookie(false);
mainWebView.reload();
+
+ // Update the toggleJavaScript icon and display a toast message if appropriate.
+ if (!javaScriptEnabled && !domStorageEnabled) {
+ toggleJavaScript.setIcon(R.drawable.privacy_mode);
+ Toast.makeText(getApplicationContext(), "Privacy Mode", Toast.LENGTH_SHORT).show();
+ } else {
+ if (domStorageEnabled) {
+ toggleJavaScript.setIcon(R.drawable.warning);
+ Toast.makeText(getApplicationContext(), "DOM Storage still enabled", Toast.LENGTH_SHORT).show();
+ } // Else Do nothing because JavaScript is enabled.
+ }
} else {
cookiesEnabled = true;
menuItem.setChecked(true);
cookieManager.setAcceptCookie(true);
mainWebView.reload();
+
+ // Update the toggleJavaScript icon if appropriate.
+ if (!javaScriptEnabled) {
+ toggleJavaScript.setIcon(R.drawable.warning);
+ } // Else Do nothing because JavaScript is enabled.
+
+ Toast.makeText(getApplicationContext(), "Cookies enabled", Toast.LENGTH_SHORT).show();
}
return true;
startActivity(downloadManangerIntent);
return true;
+ case R.id.settings:
+ // Start the Settings activity.
+ Intent intent = new Intent(this, Settings.class);
+ startActivity(intent);
+ return true;
+
case R.id.about:
// Show the AboutDialog AlertDialog and name this instance aboutDialog.
AppCompatDialogFragment aboutDialog = new AboutDialog();
projects / PrivacyBrowserAndroid.git / blobdiff