March 2018 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-52.7.2esr-8.0-1] Orfox: Disabling search widget.
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit a9366885de6def43dffac8ce3d2e4d248d40be4c Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Tue Jul 26 15:06:54 2016 +0200 Orfox: Disabling search widget. Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- mobile/android/search/manifests/SearchAndroidManifest_activities.xml.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mobile/android/search/manifests/SearchAndroidManifest_activities.xml.in b/mobile/android/search/manifests/SearchAndroidManifest_activities.xml.in index 21aee71c0f9d..e4e15077204d 100644 --- a/mobile/android/search/manifests/SearchAndroidManifest_activities.xml.in +++ b/mobile/android/search/manifests/SearchAndroidManifest_activities.xml.in @@ -26,6 +26,7 @@ </activity>  +  <activity android:name="org.mozilla.search.SearchPreferenceActivity"

1 0

[tor-browser/tor-browser-52.7.2esr-8.0-1] add support for a distribution directory (for bundling add-ons)
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit 70f793f8fcbd996488b70edb45d8b3c76d856830 Author: n8fr8 <nathan(a)freitas.net> Date: Mon Jul 17 22:19:06 2017 -0400 add support for a distribution directory (for bundling add-ons) Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- .mozconfig-orfox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mozconfig-orfox b/.mozconfig-orfox index 1db4bd923cd1..8ac842ffd116 100755 --- a/.mozconfig-orfox +++ b/.mozconfig-orfox @@ -10,7 +10,7 @@ ac_add_options --target=arm-linux-androideabi ac_add_options --with-android-ndk="$NDK_BASE" #Enter the android ndk location(ndk r10e) ac_add_options --with-android-sdk="$SDK_BASE" #Enter the android sdk location ac_add_options --with-branding=mobile/android/branding/orfox -ac_add_options --with-android-distribution-directory=mobile/android/orfox/distribution +ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/orfox/distribution #enable ccache to set amount of cache assigned for build. ac_add_options --with-ccache

1 0

[tor-browser/tor-browser-52.7.2esr-8.0-1] disable building of bouncer.apk so we can bundle in orfox see: https://bugzilla.mozilla.org/show_bug.cgi?id=1258372
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit b7b2d5e322acd40b5279054ea8167bb0ab366581 Author: n8fr8 <nathan(a)freitas.net> Date: Mon Jul 17 22:18:11 2017 -0400 disable building of bouncer.apk so we can bundle in orfox see: https://bugzilla.mozilla.org/show_bug.cgi?id=1258372 Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- mobile/android/confvars.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index 8af6925a6dc9..0821a11cfed9 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -37,6 +37,8 @@ MOZ_SOCIAL= MOZ_ANDROID_HISTORY=0 MOZ_DISABLE_EXPORT_JS=1 +MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER=0 + # use custom widget for html:select MOZ_USE_NATIVE_POPUP_WINDOWS=1

1 0

[tor-browser/tor-browser-52.7.2esr-8.0-1] fix #11 from https://github.com/amoghbl1/tor-browser/issues disable mic and QR code reader by default
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit 572f377bd0a720c0dd9d91f86c5ed94f0dbea994 Author: n8fr8 <nathan(a)freitas.net> Date: Mon Jul 17 13:28:54 2017 -0400 fix #11 from https://github.com/amoghbl1/tor-browser/issues disable mic and QR code reader by default Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- mobile/android/base/resources/xml/preferences_accessibility.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/resources/xml/preferences_accessibility.xml b/mobile/android/base/resources/xml/preferences_accessibility.xml index 8e352f1fd8c4..be50140236d5 100644 --- a/mobile/android/base/resources/xml/preferences_accessibility.xml +++ b/mobile/android/base/resources/xml/preferences_accessibility.xml @@ -25,11 +25,11 @@ <SwitchPreference android:key="android.not_a_preference.voice_input_enabled" android:title="@string/pref_voice_input" android:summary="@string/pref_voice_input_summary" - android:defaultValue="true"/> + android:defaultValue="false"/> <SwitchPreference android:key="android.not_a_preference.qrcode_enabled" android:title="@string/pref_qrcode_enabled" android:summary="@string/pref_qrcode_enabled_summary" - android:defaultValue="true"/> + android:defaultValue="false"/> </PreferenceScreen>

1 0

[tor-browser/tor-browser-52.7.2esr-8.0-1] clear on exit is now true by default
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit 7b85b5c7d32aed78a1706c75cab32970caad988a Author: n8fr8 <nathan(a)freitas.net> Date: Mon Jul 17 22:20:54 2017 -0400 clear on exit is now true by default Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- mobile/android/base/resources/xml/preferences_privacy.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/resources/xml/preferences_privacy.xml b/mobile/android/base/resources/xml/preferences_privacy.xml index 1d4593ec2523..7dff068e90c1 100644 --- a/mobile/android/base/resources/xml/preferences_privacy.xml +++ b/mobile/android/base/resources/xml/preferences_privacy.xml @@ -54,7 +54,10 @@ android:summary="@string/pref_clear_on_exit_summary2" android:dialogTitle="@string/pref_clear_on_exit_dialog_title" - android:positiveButtonText="@string/button_set"/> + android:positiveButtonText="@string/button_set" + + android:defaultValue="true" + /> <PreferenceCategory android:title="@string/pref_category_logins">

1 0

[tor-browser/tor-browser-52.7.2esr-8.0-1] for #4, ensure proxy settings are respected everywhere
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit 9f121dad020ce4dbda882df9b75e3b1a25e6985a Author: n8fr8 <nathan(a)freitas.net> Date: Tue Aug 1 17:16:48 2017 -0400 for #4, ensure proxy settings are respected everywhere Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- .../src/main/java/org/mozilla/gecko/util/ProxySelector.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java index 35010242b22d..6fe87271c825 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java @@ -30,6 +30,9 @@ import java.util.List; public class ProxySelector { public static URLConnection openConnectionWithProxy(URI uri) throws IOException { + + //Orfox: Ignore system and use Orbot/Tor + /** java.net.ProxySelector ps = java.net.ProxySelector.getDefault(); Proxy proxy = Proxy.NO_PROXY; if (ps != null) { @@ -38,8 +41,9 @@ public class ProxySelector { proxy = proxies.get(0); } } + **/ - return uri.toURL().openConnection(proxy); + return uri.toURL().openConnection(ProxySettings.getProxy()); } public ProxySelector() {

1 0

[tor-browser/tor-browser-52.7.2esr-8.0-1] partial fix for #5 disabling experiments and telemtry
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit c70dafdb07f7b7b6d65d33cf1549ecc62fed064e Author: n8fr8 <nathan(a)freitas.net> Date: Tue Aug 1 16:16:17 2017 -0400 partial fix for #5 disabling experiments and telemtry Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 6cbad4c153c5..47cb6249d09a 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -610,7 +610,9 @@ public class BrowserApp extends GeckoApp } final SafeIntent intent = new SafeIntent(getIntent()); - final boolean isInAutomation = IntentUtils.getIsInAutomationFromEnvironment(intent); + + //Orfox: this disables Switchboard testing experiments and Telemtry Uploading + final boolean isInAutomation = true; //IntentUtils.getIsInAutomationFromEnvironment(intent); // This has to be prepared prior to calling GeckoApp.onCreate, because // widget code and BrowserToolbar need it, and they're created by the

1 0

[tor-browser/tor-browser-52.7.2esr-8.0-1] set default to 'true' to clear all data
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit 8fe9f7b563c5cedd5dc75cc90df1f949c560a261 Author: n8fr8 <nathan(a)freitas.net> Date: Tue Jul 18 10:38:03 2017 -0400 set default to 'true' to clear all data Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- mobile/android/base/resources/values/arrays.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/android/base/resources/values/arrays.xml b/mobile/android/base/resources/values/arrays.xml index 8369d817da8d..d2f157a7ba33 100644 --- a/mobile/android/base/resources/values/arrays.xml +++ b/mobile/android/base/resources/values/arrays.xml @@ -99,7 +99,7 @@ <item>true</item> <item>true</item> <item>true</item> - <item>false</item> + <item>true</item> </string-array> <string-array name="pref_private_data_values"> <item>private.data.history</item>

1 0

[tor-browser/tor-browser-52.7.2esr-8.0-1] add in custom distributio for xpi bundling
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit 4b45b321d993372777f9a6f37d085c3c3dfb9b7c Author: n8fr8 <nathan(a)freitas.net> Date: Mon Jul 17 23:26:02 2017 -0400 add in custom distributio for xpi bundling update bundled extensions update extensions again for new build test disable signed add-on requirement for now (we build our own versions of add-ons) Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- mobile/android/confvars.sh | 2 +- mobile/android/orfox/distribution/README.md | 4 ++++ .../assets/distribution/bookmarks.json.off | 13 +++++++++++++ .../extensions/https-everywhere(a)eff.org.xpi | Bin 0 -> 2975335 bytes .../tor-browser-settings(a)torproject.org.xpi | Bin 0 -> 18212 bytes .../{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi | Bin 0 -> 180668 bytes .../distribution/assets/distribution/preferences.json | 13 +++++++++++++ .../locales/en-US/suggestedsites.json.off | 14 ++++++++++++++ .../distribution/suggestedsites/res/hdpi/fennec.png | Bin 0 -> 6086 bytes .../distribution/suggestedsites/res/mdpi/fennec.png | Bin 0 -> 6086 bytes .../distribution/suggestedsites/res/xhdpi/fennec.png | Bin 0 -> 6086 bytes .../distribution/suggestedsites/res/xxhdpi/fennec.png | Bin 0 -> 6086 bytes .../orfox/distribution/mozconfigs/mozconfig1.json.off | 3 +++ 13 files changed, 48 insertions(+), 1 deletion(-) diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index 0821a11cfed9..bb3b34b4627c 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -64,4 +64,4 @@ MOZ_WEBGL_CONFORMANT=1 export JS_GC_SMALL_CHUNK_SIZE=1 # Enable checking that add-ons are signed by the trusted root -MOZ_ADDON_SIGNING=1 +MOZ_ADDON_SIGNING=0 diff --git a/mobile/android/orfox/distribution/README.md b/mobile/android/orfox/distribution/README.md new file mode 100644 index 000000000000..afcd14bbb9bf --- /dev/null +++ b/mobile/android/orfox/distribution/README.md @@ -0,0 +1,4 @@ +Fennec Distribution Sample +========================== + +A sample distribution directory for Firefox for Android. For documentation about how this works, see the [Mobile Distribution wiki page](https://wiki.mozilla.org/Mobile/Distribution_Files). diff --git a/mobile/android/orfox/distribution/assets/distribution/bookmarks.json.off b/mobile/android/orfox/distribution/assets/distribution/bookmarks.json.off new file mode 100644 index 000000000000..47c8f93a9213 --- /dev/null +++ b/mobile/android/orfox/distribution/assets/distribution/bookmarks.json.off @@ -0,0 +1,13 @@ +[ + { + "url": "http://example.com/1", + "title": "Bookmark #1", + "icon": "data:image/png;base64,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" + }, + { + "url": "https://example.com/2", + "title": "Bookmark #2", + "icon": "data:image/png;base64,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" + } +] + diff --git a/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere(a)eff.org.xpi b/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere(a)eff.org.xpi new file mode 100644 index 000000000000..3b1ed8ec1c02 Binary files /dev/null and b/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere(a)eff.org.xpi differ diff --git a/mobile/android/orfox/distribution/assets/distribution/extensions/tor-browser-settings(a)torproject.org.xpi b/mobile/android/orfox/distribution/assets/distribution/extensions/tor-browser-settings(a)torproject.org.xpi new file mode 100644 index 000000000000..2885a875fd4f Binary files /dev/null and b/mobile/android/orfox/distribution/assets/distribution/extensions/tor-browser-settings(a)torproject.org.xpi differ diff --git a/mobile/android/orfox/distribution/assets/distribution/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi b/mobile/android/orfox/distribution/assets/distribution/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi new file mode 100644 index 000000000000..0dbd36a3ebd9 Binary files /dev/null and b/mobile/android/orfox/distribution/assets/distribution/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi differ diff --git a/mobile/android/orfox/distribution/assets/distribution/preferences.json b/mobile/android/orfox/distribution/assets/distribution/preferences.json new file mode 100644 index 000000000000..d62e69e2e31f --- /dev/null +++ b/mobile/android/orfox/distribution/assets/distribution/preferences.json @@ -0,0 +1,13 @@ +{ + "Global": { + "id": "Orfox", + "version": 7.5.1, + "about": "Orfox" + }, + "Preferences": { + "privacy.donottrackheader.enabled": false + }, + "LocalizablePreferences": { + "browser.search.defaultenginename": "DuckDuckGo" + } +} diff --git a/mobile/android/orfox/distribution/assets/distribution/suggestedsites/locales/en-US/suggestedsites.json.off b/mobile/android/orfox/distribution/assets/distribution/suggestedsites/locales/en-US/suggestedsites.json.off new file mode 100644 index 000000000000..c1ab6dbe1342 --- /dev/null +++ b/mobile/android/orfox/distribution/assets/distribution/suggestedsites/locales/en-US/suggestedsites.json.off @@ -0,0 +1,14 @@ +[ + { + "url": "http://example.com/1", + "title": "Example Site #1", + "imageurl": "gecko.distribution://suggestedsites/res/fennec", + "bgcolor": "#F400A1" + }, + { + "url": "https://example.com/2", + "title": "Example Site #2", + "imageurl": "gecko.distribution://suggestedsites/res/fennec", + "bgcolor": "#FF7F00" + } +] \ No newline at end of file diff --git a/mobile/android/orfox/distribution/assets/distribution/suggestedsites/res/hdpi/fennec.png b/mobile/android/orfox/distribution/assets/distribution/suggestedsites/res/hdpi/fennec.png new file mode 100644 index 000000000000..de9ca927e645 Binary files /dev/null and b/mobile/android/orfox/distribution/assets/distribution/suggestedsites/res/hdpi/fennec.png differ diff --git a/mobile/android/orfox/distribution/assets/distribution/suggestedsites/res/mdpi/fennec.png b/mobile/android/orfox/distribution/assets/distribution/suggestedsites/res/mdpi/fennec.png new file mode 100644 index 000000000000..de9ca927e645 Binary files /dev/null and b/mobile/android/orfox/distribution/assets/distribution/suggestedsites/res/mdpi/fennec.png differ diff --git a/mobile/android/orfox/distribution/assets/distribution/suggestedsites/res/xhdpi/fennec.png b/mobile/android/orfox/distribution/assets/distribution/suggestedsites/res/xhdpi/fennec.png new file mode 100644 index 000000000000..de9ca927e645 Binary files /dev/null and b/mobile/android/orfox/distribution/assets/distribution/suggestedsites/res/xhdpi/fennec.png differ diff --git a/mobile/android/orfox/distribution/assets/distribution/suggestedsites/res/xxhdpi/fennec.png b/mobile/android/orfox/distribution/assets/distribution/suggestedsites/res/xxhdpi/fennec.png new file mode 100644 index 000000000000..de9ca927e645 Binary files /dev/null and b/mobile/android/orfox/distribution/assets/distribution/suggestedsites/res/xxhdpi/fennec.png differ diff --git a/mobile/android/orfox/distribution/mozconfigs/mozconfig1.json.off b/mobile/android/orfox/distribution/mozconfigs/mozconfig1.json.off new file mode 100644 index 000000000000..453ecf0d394d --- /dev/null +++ b/mobile/android/orfox/distribution/mozconfigs/mozconfig1.json.off @@ -0,0 +1,3 @@ +{ + "gecko_path": "mobile/android/config/mozconfigs/public-partner/distribution_sample/mozconfig1" +}

1 0

[tor-browser/tor-browser-52.7.2esr-8.0-1] show only the "restricted" onboarding first time screens
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit 1651731cd92cd03c6433685b17fad2232a374156 Author: n8fr8 <nathan(a)freitas.net> Date: Tue Jul 18 14:55:02 2017 -0400 show only the "restricted" onboarding first time screens simplify restricted mode first time string tune the "First Run" user experience - show the restricted first run - change the link to the Orfox app page Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- .../base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java | 5 +++++ .../base/java/org/mozilla/gecko/firstrun/RestrictedWelcomePanel.java | 2 +- mobile/android/base/locales/en-US/android_strings.dtd | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java index 3f901d07b0fb..cb7e31fc7dfc 100644 --- a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java +++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java @@ -25,6 +25,10 @@ public class FirstrunPagerConfig { public static final String KEY_SUBTEXT = "subtextRes"; public static List<FirstrunPanelConfig> getDefault(Context context) { + + return getRestricted (); + + /** final List<FirstrunPanelConfig> panels = new LinkedList<>(); if (Experiments.isInExperimentLocal(context, Experiments.ONBOARDING3_B)) { @@ -46,6 +50,7 @@ public class FirstrunPagerConfig { panels.add(SimplePanelConfigs.signInPanelConfig); } return panels; + **/ } public static List<FirstrunPanelConfig> getRestricted() { diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/RestrictedWelcomePanel.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/RestrictedWelcomePanel.java index efc91d20f486..b3b02c91001e 100644 --- a/mobile/android/base/java/org/mozilla/gecko/firstrun/RestrictedWelcomePanel.java +++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/RestrictedWelcomePanel.java @@ -21,7 +21,7 @@ import java.util.EnumSet; public class RestrictedWelcomePanel extends FirstrunPanel { public static final int TITLE_RES = R.string.firstrun_panel_title_welcome; - private static final String LEARN_MORE_URL = "https://support.mozilla.org/kb/controlledaccess"; + private static final String LEARN_MORE_URL = "https://guardianproject.info/apps/orfox"; private HomePager.OnUrlOpenListener onUrlOpenListener; diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index 140e2a21689c..fd51410c8d21 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -38,7 +38,7 @@ <!ENTITY firstrun_account_title "You"> <!ENTITY firstrun_account_message "Have &brandShortName; on another device?"> -<!ENTITY onboard_start_restricted1 "Stay safe and in control with this simplified version of &brandShortName;."> +<!ENTITY onboard_start_restricted1 "Stay safe and in control with &brandShortName;.">

1 0