From 9133910bd316f6a50d478c26283c2cc5447483a7 Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Thu, 18 May 2017 11:30:44 -0700
Subject: [PATCH] Add the title when sharing a URL. Implements
https://redmine.stoutner.com/issues/130.
---
app/src/main/assets/de/about_licenses.html | 1 +
app/src/main/assets/en/about_licenses.html | 1 +
.../main/assets/en/images/ic_location_off.png | Bin 0 -> 1880 bytes
app/src/main/assets/es/about_licenses.html | 1 +
app/src/main/assets/it/about_licenses.html | 1 +
.../main/assets/zh-rTW/about_licenses.html | 1 +
.../activities/MainWebViewActivity.java | 13 +-
.../fragments/SettingsFragment.java | 146 ++++++++++++------
.../res/drawable/do_not_track_disabled.xml | 17 ++
.../res/drawable/do_not_track_enabled.xml | 17 ++
...{user_agent.xml => user_agent_enabled.xml} | 2 +-
.../main/res/drawable/user_agent_ghosted.xml | 18 +++
app/src/main/res/layout/domain_settings.xml | 2 +-
app/src/main/res/xml/preferences.xml | 2 +-
14 files changed, 170 insertions(+), 52 deletions(-)
create mode 100644 app/src/main/assets/en/images/ic_location_off.png
create mode 100644 app/src/main/res/drawable/do_not_track_disabled.xml
create mode 100644 app/src/main/res/drawable/do_not_track_enabled.xml
rename app/src/main/res/drawable/{user_agent.xml => user_agent_enabled.xml} (86%)
create mode 100644 app/src/main/res/drawable/user_agent_ghosted.xml
diff --git a/app/src/main/assets/de/about_licenses.html b/app/src/main/assets/de/about_licenses.html
index 3e4da269..a9b150c8 100644
--- a/app/src/main/assets/de/about_licenses.html
+++ b/app/src/main/assets/de/about_licenses.html
@@ -81,6 +81,7 @@
<p><img class="icon" src="../en/images/ic_info_outline.png"> ic_info_outline.</p>
<p><img class="icon" src="../en/images/ic_language.png"> ic_language.</p>
<p><img class="icon" src="../en/images/ic_list.png"> ic_list.</p>
+ <p><img class="icon" src="../en/images/ic_location_off.png"> ic_location_off.</p>
<p><img class="icon" src="../en/images/ic_more.png"> ic_more.</p>
<p><img class="icon" src="../en/images/ic_question_answer.png"> ic_question_answer.</p>
<p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
diff --git a/app/src/main/assets/en/about_licenses.html b/app/src/main/assets/en/about_licenses.html
index 6be0e356..f655a94c 100644
--- a/app/src/main/assets/en/about_licenses.html
+++ b/app/src/main/assets/en/about_licenses.html
@@ -79,6 +79,7 @@
<p><img class="icon" src="images/ic_info_outline.png"> ic_info_outline.</p>
<p><img class="icon" src="images/ic_language.png"> ic_language.</p>
<p><img class="icon" src="images/ic_list.png"> ic_list.</p>
+ <p><img class="icon" src="images/ic_location_off.png"> ic_location_off.</p>
<p><img class="icon" src="images/ic_more.png"> ic_more.</p>
<p><img class="icon" src="images/ic_question_answer.png"> ic_question_answer.</p>
<p><img class="icon" src="images/ic_select_all.png"> ic_select_all.</p>
diff --git a/app/src/main/assets/en/images/ic_location_off.png b/app/src/main/assets/en/images/ic_location_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..181aba4a77d6a8a88932287376fac57c040506ac
GIT binary patch
literal 1880
zcmV-e2dDUnP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00004b3#c}2nYxW
zd<bNS00009a7bBm001Xn001Xn0Ud_AY5)KL8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H12GvPKK~#90?VVkSmPHiDf3KS#TdrwH_?438x|SDO7TpwRUpG<F
zMN$x97xqCYePAY0iWlAV1tFzfL=*%TVmC%esS!m5vJ@DK24%UVskK^cweEH?tFGJo
z^~^JK&OFb1esEY=cxTSc`M+o8nRjL$Fbu;m48t%C!!QiPFbt#oRJ0us<|1G^&;d*Y
z#t;4fPvFGR-$O%xTY@qRU=pwdxB<8lm<P<Hxi%jH_5pi=&w$;)Z*kl-LNW(f2Ye0m
z1A~F=G|&xf06L`_V>HKD-~nJ4FhIDV*RwByhk*9@%`<8-23Ubh*AhXmW=C)tXJXu@
z8pEjo%YmQK3;aks20Q|cirDUC=>&EH(*)|e0@#6mz-!qa;QDB-PmnI)Fs||615+c_
zQvp^3edq_dk@e$-g|-+SkrJK2FPz`_eT2^h6MzrU31%LX%8Dus|K^XhkeOfsaIi)_
zMX(-VQJ}s^hHBsZkrpBoEC!A?sHX^a61X*IUnE1lZ+^&3umtFBvYsMXA8?mvUnIkH
znh$<n5j>Z%o+4Nuu+*b3lA!`@BzwbshlBMVb){~-z||gokqi}J6WJT?n+Y~})RnsR
z08>2rA{i_b<hPv^e4W5Vkl&v7=!c}R;UJ&&1J`);LsD2K$Y<YBf*+7f1o>=*M;|1I
z4F~>qlyiF%3yoz0e|yrS{YhdX@UtFDw7skXY$kgrwEA#Rin+iUQWwDy+;;D6z;@tU
z+_rB`0es=n?xaag1U~?4aOVSRu@JXFbHKyzyfy&L^=Nm}q#%M*z|**0#LY4qcnp^*
zBt@{^qs_^qDS~d`vK+oo!JPq+62P7uz9x-^2tFswe*JO4`%U_r*G>bM1n@aYD!{wQ
zi6BeLZ^Ss{GQr&e{ceclI`klJgJ)K{fKSOTf`2^fszo0zFcJquZxpCQjji~9Gh%Ex
z&&o>TXMm5zTBE=|@^wzk!zax!hWOjme-vwtFztjnvaKzGbya){X{Uh;r5Yp2EW&k?
zrU(`_>0=(Nw^$Vv$w}bF0n7587>1x5I3Br<j>zSoMN$Bh0+-i?yA(otVmOF9njRCe
z{Q*VI0B4Xqnm(Mvk;|VDx%{(83LsWp8Y1WytSc�{AOp*`2^A$ju32FW2@)F8?f&
z0*HP0p5(-^D{}cKBbTqjY~nvYNjxH6E6|475&c(V3~rG_LIg3FjbDuH`@gvT2&F{w
zX0I5TU@Y;krQ09a=ekIrO8HK(t{8KIr+^s&%d5tL$mO3$nFRo0MKB9k8=#y<bPLp>
z#y!Xl0U?Kj3An&W_<DN|Ka*!FIs(Wef>F3N1_>VrfXN;{7K;58PXwz4{VP4Mp(lVr
z{2vjY5b*6455Ee>Qgj87vIuVW@TqXLk;Vm(sfpkuZk?eecnf_243gHIV2g(zh2;+P
zgP&R^xYNUj!qSdQdD_8GB@-MY>_L`7;B!>0teN0-k9rHwLiB^4iU<~a)L9C?LO<x*
zA}H;N;AU8ke!#Uw@SsOMrJ)_S$6h<&)l6byc$|`+0?NY6=m%R%1TT1$T{>m}f1@Al
zS{7?K=tK96V^X|{exRjAu-T)$(lQ6P8B#mY^(^FY(2w8&(4ydTeN0g^!8;yhl%Dy>
zZ5!7Vfqnbyum$}9H)DB*gSS0C*D}n-UGAhE;Fuz4`RD#dXm1&l7!Hg&Oa^{OKe#3W
zMb@GpSQCLF?Z8jy2i8QO$o=RCHLGb~VOJ_DxT{~ZgKC*Tk*g@qW1)#45-I;&T+eJc
z2t)_67fV<sNRWHc52j@TWj;hdn3f3?nFgFdKbR&0MIJ^!kR}2}D!>l(18E{q<Z{wF
zS7;(oU={j7%xm^^kb~5Qf?dESkI$J1axfittXezxCxDqaQEv43ybT9AxDR~+EF0#J
zi9mt(&<p+>Rs1m#2r~)yu084C@1^zz&k8mt5al{#e>U#JU2stk%LKwai<|&fHR+Ry
zK#)<$JQ{w43v9EP2n3l1{7Ssw_W+lA_+@hfL2e?<JBmkIKX6M9zf1&ztRcJro(bTW
z4F^J0fUSfJ{x-6W`;C0dnh6GQyP}K?bl{%V^9FxE;a_{3B@+w)j|Q&4Wta#2fq(E%
z;kKs7pcxTZ@B^?6e*rA3QeH^viNJy%kXOkb{Fj7$t0n>qeqcreyJ<f7yMPM>{Tn_p
z8~|1b*4;8p1`g6V_y^H>b5{lT>!JleBJ-)gwY(Qtpyr(+!fjN)ldzwXzqHXf$K(88
z04r5JGQ=6a8rPC<>}Yk`aOVxTBRk_a5@P(28HQmPhG7_nVHk#C7=~e#nEwDo!W@=9
SuJKm@0000<MNUMnLSTYB3PnW#
literal 0
HcmV?d00001
diff --git a/app/src/main/assets/es/about_licenses.html b/app/src/main/assets/es/about_licenses.html
index f5d218ec..b1e6b16a 100644
--- a/app/src/main/assets/es/about_licenses.html
+++ b/app/src/main/assets/es/about_licenses.html
@@ -79,6 +79,7 @@
<p><img class="icon" src="../en/images/ic_info_outline.png"> ic_info_outline.</p>
<p><img class="icon" src="../en/images/ic_language.png"> ic_language.</p>
<p><img class="icon" src="../en/images/ic_list.png"> ic_list.</p>
+ <p><img class="icon" src="../en/images/ic_location_off.png"> ic_location_off.</p>
<p><img class="icon" src="../en/images/ic_more.png"> ic_more.</p>
<p><img class="icon" src="../en/images/ic_question_answer.png"> ic_question_answer.</p>
<p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
diff --git a/app/src/main/assets/it/about_licenses.html b/app/src/main/assets/it/about_licenses.html
index f92b4f3a..c7ad171f 100644
--- a/app/src/main/assets/it/about_licenses.html
+++ b/app/src/main/assets/it/about_licenses.html
@@ -85,6 +85,7 @@
<p><img class="icon" src="../en/images/ic_info_outline.png"> ic_info_outline.</p>
<p><img class="icon" src="../en/images/ic_language.png"> ic_language.</p>
<p><img class="icon" src="../en/images/ic_list.png"> ic_list.</p>
+ <p><img class="icon" src="../en/images/ic_location_off.png"> ic_location_off.</p>
<p><img class="icon" src="../en/images/ic_more.png"> ic_more.</p>
<p><img class="icon" src="../en/images/ic_question_answer.png"> ic_question_answer.</p>
<p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
diff --git a/app/src/main/assets/zh-rTW/about_licenses.html b/app/src/main/assets/zh-rTW/about_licenses.html
index ab596eae..741f8db7 100644
--- a/app/src/main/assets/zh-rTW/about_licenses.html
+++ b/app/src/main/assets/zh-rTW/about_licenses.html
@@ -79,6 +79,7 @@
<p><img class="icon" src="../en/images/ic_info_outline.png"> ic_info_outline.</p>
<p><img class="icon" src="../en/images/ic_language.png"> ic_language.</p>
<p><img class="icon" src="../en/images/ic_list.png"> ic_list.</p>
+ <p><img class="icon" src="../en/images/ic_location_off.png"> ic_location_off.</p>
<p><img class="icon" src="../en/images/ic_more.png"> ic_more.</p>
<p><img class="icon" src="../en/images/ic_question_answer.png"> ic_question_answer.</p>
<p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
index a7dfad7e..9551b16c 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -1236,10 +1236,21 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
return true;
case R.id.share:
+ // Setup the share string.
+ String shareString;
+ if (webViewTitle != null) {
+ shareString = webViewTitle + " â " + urlTextBox.getText().toString();
+ } else {
+ shareString = urlTextBox.getText().toString();
+ }
+
+ // Create the share intent.
Intent shareIntent = new Intent();
shareIntent.setAction(Intent.ACTION_SEND);
- shareIntent.putExtra(Intent.EXTRA_TEXT, urlTextBox.getText().toString());
+ shareIntent.putExtra(Intent.EXTRA_TEXT, shareString);
shareIntent.setType("text/plain");
+
+ // Make it so.
startActivity(Intent.createChooser(shareIntent, "Share URL"));
return true;
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
index 75e008ad..06fd18ec 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
@@ -44,12 +44,14 @@ public class SettingsFragment extends PreferenceFragment {
savedPreferences = getPreferenceScreen().getSharedPreferences();
// Get handles for the preferences we need to modify.
- final Preference javaScriptEnabled = findPreference("javascript_enabled");
- final Preference firstPartyCookiesEnabled = findPreference("first_party_cookies_enabled");
- final Preference thirdPartyCookiesEnabled = findPreference("third_party_cookies_enabled");
- final Preference domStorageEnabled = findPreference("dom_storage_enabled");
+ final Preference javaScriptPreference = findPreference("javascript_enabled");
+ final Preference firstPartyCookiesPreference = findPreference("first_party_cookies_enabled");
+ final Preference thirdPartyCookiesPreference = findPreference("third_party_cookies_enabled");
+ final Preference domStoragePreference = findPreference("dom_storage_enabled");
+ final Preference saveFormDataPreference = findPreference("save_form_data_enabled");
final Preference userAgentPreference = findPreference("user_agent");
- final Preference customUserAgent = findPreference("custom_user_agent");
+ final Preference customUserAgentPreference = findPreference("custom_user_agent");
+ final Preference doNotTrackPreference = findPreference("do_not_track");
final Preference torHomepagePreference = findPreference("tor_homepage");
final Preference torSearchPreference = findPreference("tor_search");
final Preference torSearchCustomURLPreference = findPreference("tor_search_custom_url");
@@ -61,7 +63,7 @@ public class SettingsFragment extends PreferenceFragment {
final Preference defaultFontSizePreference = findPreference("default_font_size");
// Set dependencies.
- domStorageEnabled.setDependency("javascript_enabled");
+ domStoragePreference.setDependency("javascript_enabled");
torHomepagePreference.setDependency("proxy_through_orbot");
torSearchPreference.setDependency("proxy_through_orbot");
hideSystemBarsPreference.setDependency("enable_full_screen_browsing_mode");
@@ -75,8 +77,8 @@ public class SettingsFragment extends PreferenceFragment {
boolean firstPartyCookiesEnabledBoolean = savedPreferences.getBoolean("first_party_cookies_enabled", false);
boolean thirdPartyCookiesEnabledBoolean = savedPreferences.getBoolean("third_party_cookies_enabled", false);
- // Only enable `third_party_cookies_enabled` if `first_party_cookies_enabled` is `true` and API >= 21.
- thirdPartyCookiesEnabled.setEnabled(firstPartyCookiesEnabledBoolean && (Build.VERSION.SDK_INT >= 21));
+ // Only enable `thirdPartyCookiesPreference` if `firstPartyCookiesEnabledBoolean` is `true` and API >= 21.
+ thirdPartyCookiesPreference.setEnabled(firstPartyCookiesEnabledBoolean && (Build.VERSION.SDK_INT >= 21));
// We need to inflated a `WebView` to get the default user agent.
LayoutInflater inflater = getActivity().getLayoutInflater();
@@ -102,9 +104,9 @@ public class SettingsFragment extends PreferenceFragment {
break;
}
- // Set the summary text for "custom_user_agent" (the default is "PrivacyBrowser/1.0") and enable it if "user_agent" it set to "Custom user agent".
- customUserAgent.setSummary(savedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"));
- customUserAgent.setEnabled(userAgentPreference.getSummary().equals("Custom user agent"));
+ // Set the summary text for "customUserAgentPreference" (the default is `PrivacyBrowser/1.0`) and enable it if `userAgentPreference` it set to `Custom user agent`.
+ customUserAgentPreference.setSummary(savedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"));
+ customUserAgentPreference.setEnabled(userAgentPreference.getSummary().equals("Custom user agent"));
// Set the Tor homepage URL as the summary text for the `tor_homepage` preference when the preference screen is loaded. The default is DuckDuckGo: `https://3g2upl4pq6kufc4m.onion`.
@@ -152,40 +154,61 @@ public class SettingsFragment extends PreferenceFragment {
defaultFontSizePreference.setSummary(savedPreferences.getString("default_font_size", "100") + "%%");
- // Set the `javascript_enabled` icon.
+ // Set the `javaScriptPreference` icon.
if (javaScriptEnabledBoolean) {
- javaScriptEnabled.setIcon(R.drawable.javascript_enabled);
+ javaScriptPreference.setIcon(R.drawable.javascript_enabled);
} else {
- javaScriptEnabled.setIcon(R.drawable.privacy_mode);
+ javaScriptPreference.setIcon(R.drawable.privacy_mode);
}
- // Set the `first_party_cookies_enabled` icon.
+ // Set the `firstPartyCookiesPreference` icon.
if (firstPartyCookiesEnabledBoolean) {
- firstPartyCookiesEnabled.setIcon(R.drawable.cookies_enabled);
+ firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled);
} else {
- firstPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled);
+ firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
}
- // Set the `third_party_cookies_enabled` icon.
+ // Set the `thirdPartyCookiesPreference` icon.
if (firstPartyCookiesEnabledBoolean && Build.VERSION.SDK_INT >= 21) {
if (thirdPartyCookiesEnabledBoolean) {
- thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_warning);
+ thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
} else {
- thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled);
+ thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
}
} else {
- thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_ghosted);
+ thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted);
}
- // Set the `dom_storage_enabled` icon.
+ // Set the `domStoragePreference` icon.
if (javaScriptEnabledBoolean) {
if (savedPreferences.getBoolean("dom_storage_enabled", false)) {
- domStorageEnabled.setIcon(R.drawable.dom_storage_enabled);
+ domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else {
- domStorageEnabled.setIcon(R.drawable.dom_storage_disabled);
+ domStoragePreference.setIcon(R.drawable.dom_storage_disabled);
}
} else {
- domStorageEnabled.setIcon(R.drawable.dom_storage_ghosted);
+ domStoragePreference.setIcon(R.drawable.dom_storage_ghosted);
+ }
+
+ // Set the `saveFormDataPreference` icon.
+ if (savedPreferences.getBoolean("save_form_data_enabled", false)) {
+ saveFormDataPreference.setIcon(R.drawable.form_data_enabled);
+ } else {
+ saveFormDataPreference.setIcon(R.drawable.form_data_disabled);
+ }
+
+ // Set the `customUserAgentPreference` icon.
+ if (customUserAgentPreference.isEnabled()) {
+ customUserAgentPreference.setIcon(R.drawable.user_agent_enabled);
+ } else {
+ customUserAgentPreference.setIcon(R.drawable.user_agent_ghosted);
+ }
+
+ // Set the `doNotTrackPreference` icon.
+ if (savedPreferences.getBoolean("do_not_track", false)) {
+ doNotTrackPreference.setIcon(R.drawable.do_not_track_enabled);
+ } else {
+ doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled);
}
// Listen for preference changes.
@@ -200,20 +223,20 @@ public class SettingsFragment extends PreferenceFragment {
// Update the icons.
if (sharedPreferences.getBoolean("javascript_enabled", false)) {
// Update the icon for `javascript_enabled`.
- javaScriptEnabled.setIcon(R.drawable.javascript_enabled);
+ javaScriptPreference.setIcon(R.drawable.javascript_enabled);
// Update the icon for `dom_storage_enabled`.
if (sharedPreferences.getBoolean("dom_storage_enabled", false)) {
- domStorageEnabled.setIcon(R.drawable.dom_storage_enabled);
+ domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else {
- domStorageEnabled.setIcon(R.drawable.dom_storage_disabled);
+ domStoragePreference.setIcon(R.drawable.dom_storage_disabled);
}
} else { // `javascript_enabled` is `false`.
// Update the icon for `javascript_enabled`.
- javaScriptEnabled.setIcon(R.drawable.privacy_mode);
+ javaScriptPreference.setIcon(R.drawable.privacy_mode);
// Set the icon for `dom_storage_disabled` to be ghosted.
- domStorageEnabled.setIcon(R.drawable.dom_storage_ghosted);
+ domStoragePreference.setIcon(R.drawable.dom_storage_ghosted);
}
break;
@@ -221,75 +244,102 @@ public class SettingsFragment extends PreferenceFragment {
// Update the icons for `first_party_cookies_enabled` and `third_party_cookies_enabled`.
if (sharedPreferences.getBoolean("first_party_cookies_enabled", false)) {
// Set the icon for `first_party_cookies_enabled`.
- firstPartyCookiesEnabled.setIcon(R.drawable.cookies_enabled);
+ firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled);
// Update the icon for `third_party_cookies_enabled`.
if (Build.VERSION.SDK_INT >= 21) {
if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) {
- thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_warning);
+ thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
} else {
- thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled);
+ thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
}
} else {
- thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_ghosted);
+ thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted);
}
} else { // `first_party_cookies_enabled` is `false`.
// Update the icon for `first_party_cookies_enabled`.
- firstPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled);
+ firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
// Set the icon for `third_party_cookies_enabled` to be ghosted.
- thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_ghosted);
+ thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted);
}
// Enable `third_party_cookies_enabled` if `first_party_cookies_enabled` is `true` and API >= 21.
- thirdPartyCookiesEnabled.setEnabled(sharedPreferences.getBoolean("first_party_cookies_enabled", false) && (Build.VERSION.SDK_INT >= 21));
+ thirdPartyCookiesPreference.setEnabled(sharedPreferences.getBoolean("first_party_cookies_enabled", false) && (Build.VERSION.SDK_INT >= 21));
break;
case "third_party_cookies_enabled":
// Update the icon.
if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) {
- thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_warning);
+ thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
} else {
- thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled);
+ thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
}
break;
case "dom_storage_enabled":
// Update the icon.
if (sharedPreferences.getBoolean("dom_storage_enabled", false)) {
- domStorageEnabled.setIcon(R.drawable.dom_storage_enabled);
+ domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else {
- domStorageEnabled.setIcon(R.drawable.dom_storage_disabled);
+ domStoragePreference.setIcon(R.drawable.dom_storage_disabled);
}
break;
+ case "save_form_data_enabled":
+ // Update the icon.
+ if (sharedPreferences.getBoolean("save_form_data_enabled", false)) {
+ saveFormDataPreference.setIcon(R.drawable.form_data_enabled);
+ } else {
+ saveFormDataPreference.setIcon(R.drawable.form_data_disabled);
+ }
+
case "user_agent":
String userAgentString = sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0");
switch (userAgentString) {
case "WebView default user agent":
- // Display the user agent as the summary text for `userAgentPreference`, and disable `customUserAgent`.
+ // Display the user agent as the summary text for `userAgentPreference`.
userAgentPreference.setSummary(bareWebView.getSettings().getUserAgentString());
- customUserAgent.setEnabled(false);
+
+ // Update `customUserAgentPreference`.
+ customUserAgentPreference.setEnabled(false);
+ customUserAgentPreference.setIcon(R.drawable.user_agent_ghosted);
break;
case "Custom user agent":
- // Display `Custom user agent` as the summary text for `userAgentPreference`, and enable `customUserAgent`.
+ // Display `Custom user agent` as the summary text for `userAgentPreference`.
userAgentPreference.setSummary(R.string.custom_user_agent);
- customUserAgent.setEnabled(true);
+
+ // Update `customUserAgentPreference`.
+ customUserAgentPreference.setEnabled(true);
+ customUserAgentPreference.setIcon(R.drawable.user_agent_enabled);
break;
default:
- // Display the user agent as the summary text for `userAgentPreference`, and disable `customUserAgent`.
+ // Display the user agent as the summary text for `userAgentPreference`.
userAgentPreference.setSummary(sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0"));
- customUserAgent.setEnabled(false);
+
+ // Update `customUserAgentPreference`.
+ customUserAgentPreference.setEnabled(false);
+ customUserAgentPreference.setIcon(R.drawable.user_agent_ghosted);
break;
}
break;
case "custom_user_agent":
// Set the new custom user agent as the summary text for `custom_user_agent`. The default is `PrivacyBrowser/1.0`.
- customUserAgent.setSummary(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"));
+ customUserAgentPreference.setSummary(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"));
+ break;
+
+ case "do_not_track":
+ // Update the icon.
+ if (sharedPreferences.getBoolean("do_not_track", false)) {
+ doNotTrackPreference.setIcon(R.drawable.do_not_track_enabled);
+ } else {
+ doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled);
+ }
+
break;
case "proxy_through_orbot":
diff --git a/app/src/main/res/drawable/do_not_track_disabled.xml b/app/src/main/res/drawable/do_not_track_disabled.xml
new file mode 100644
index 00000000..77ba07e1
--- /dev/null
+++ b/app/src/main/res/drawable/do_not_track_disabled.xml
@@ -0,0 +1,17 @@
+<!-- `do_not_track_disabled.xml` comes from the Android Material icon set, where it is called `ic_location_off`. It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:autoMirrored="true"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0"
+ tools:ignore="VectorRaster" >
+
+ <path
+ android:fillColor="#88000000"
+ android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
+</vector>
diff --git a/app/src/main/res/drawable/do_not_track_enabled.xml b/app/src/main/res/drawable/do_not_track_enabled.xml
new file mode 100644
index 00000000..c60ecc1b
--- /dev/null
+++ b/app/src/main/res/drawable/do_not_track_enabled.xml
@@ -0,0 +1,17 @@
+<!-- `do_not_track_enabled.xml` comes from the Android Material icon set, where it is called `ic_location_off`. It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:autoMirrored="true"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0"
+ tools:ignore="VectorRaster" >
+
+ <path
+ android:fillColor="#FF1565C0"
+ android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
+</vector>
diff --git a/app/src/main/res/drawable/user_agent.xml b/app/src/main/res/drawable/user_agent_enabled.xml
similarity index 86%
rename from app/src/main/res/drawable/user_agent.xml
rename to app/src/main/res/drawable/user_agent_enabled.xml
index a346c597..35fba81a 100644
--- a/app/src/main/res/drawable/user_agent.xml
+++ b/app/src/main/res/drawable/user_agent_enabled.xml
@@ -1,4 +1,4 @@
-<!-- `move_to_folder.xml` comes from the Android Material icon set, where it is called `ic_folder_special`. It is released under the Apache License 2.0. -->
+<!-- `user_agent_enabled.xml` comes from the Android Material icon set, where it is called `ic_devices_other`. It is released under the Apache License 2.0. -->
<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
<vector
diff --git a/app/src/main/res/drawable/user_agent_ghosted.xml b/app/src/main/res/drawable/user_agent_ghosted.xml
new file mode 100644
index 00000000..1077eed3
--- /dev/null
+++ b/app/src/main/res/drawable/user_agent_ghosted.xml
@@ -0,0 +1,18 @@
+<!-- `user_agent_ghosted.xml` comes from the Android Material icon set, where it is called `ic_devices_other`. It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0"
+ android:autoMirrored="true"
+ tools:ignore="VectorRaster" >
+
+ <!-- We have to use a hard coded color code until API >= 21. Then we can use `@color`. -->
+ <path
+ android:fillColor="#44000000"
+ android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"/>
+</vector>
diff --git a/app/src/main/res/layout/domain_settings.xml b/app/src/main/res/layout/domain_settings.xml
index 00479b52..ec020546 100644
--- a/app/src/main/res/layout/domain_settings.xml
+++ b/app/src/main/res/layout/domain_settings.xml
@@ -236,7 +236,7 @@
android:layout_marginTop="1dp"
android:layout_marginEnd="10dp"
android:layout_gravity="center_vertical"
- android:src="@drawable/user_agent"
+ android:src="@drawable/user_agent_enabled"
android:contentDescription="@string/user_agent" />
<Spinner
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index aa5db948..da445d14 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -59,7 +59,7 @@
android:entries="@array/user_agent_entries"
android:entryValues="@array/user_agent_entry_values"
android:defaultValue="PrivacyBrowser/1.0"
- android:icon="@drawable/user_agent" />
+ android:icon="@drawable/user_agent_enabled" />
<!-- android:inputType="textVisiblePassword" sets the keyboard to have a dedicated number row.-->
<EditTextPreference
--
2.47.2