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

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25696 - Implement alpha onboarding for Tor Browser for Android
by gk＠torproject.org 20 Aug '18

20 Aug '18

commit 9c58e200f6eb526a5b337138b994b9eb31af5817 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Aug 6 00:12:26 2018 -0300 Bug 25696 - Implement alpha onboarding for Tor Browser for Android - FirstrunTorPagerConfig.java: Create file that sets up all the views in the pager. - FirstrunPager.java: Update code to use the FirstrunTorPagerConfig. - FirstrunLastPanel.java: Create view that adds a close handler in the latest pager view. --- .../res/layout/firstrun_animation_container.xml | 10 +-- .../firstrun_basepanel_checkable_fragment.xml | 34 ++++++---- .../android/app/src/photon/res/values/colors.xml | 4 +- .../android/app/src/photon/res/values/styles.xml | 7 ++ .../mozilla/gecko/firstrun/FirstrunLastPanel.java | 30 +++++++++ .../org/mozilla/gecko/firstrun/FirstrunPager.java | 18 ++--- .../gecko/firstrun/FirstrunTorPagerConfig.java | 74 +++++++++++++++++++++ .../java/org/mozilla/gecko/firstrun/LastPanel.java | 11 ++- .../android/base/locales/en-US/android_strings.dtd | 20 +++++- mobile/android/base/strings.xml.in | 22 +++++- .../res/drawable-nodpi/figure_experience.png | Bin 0 -> 44299 bytes .../res/drawable-nodpi/figure_network.png | Bin 0 -> 70302 bytes .../torbrowser/res/drawable-nodpi/figure_onion.png | Bin 0 -> 139952 bytes .../res/drawable-nodpi/figure_privacy.png | Bin 0 -> 61696 bytes .../res/drawable-nodpi/figure_welcome.png | Bin 0 -> 83798 bytes .../drawable-nodpi/home_tab_menu_strip_tor.9.png | Bin 0 -> 126 bytes 16 files changed, 189 insertions(+), 41 deletions(-) diff --git a/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml b/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml index 3e7225365c57..dd20466a8e1a 100644 --- a/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml +++ b/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml @@ -8,7 +8,7 @@ xmlns:gecko="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" android:layout_width="match_parent" - android:background="@color/dark_transparent_overlay"> + android:background="@android:color/white"> <org.mozilla.gecko.firstrun.FirstrunPager android:id="@+id/firstrun_pager" @@ -18,12 +18,12 @@ <org.mozilla.gecko.home.TabMenuStrip android:layout_width="match_parent" android:layout_height="@dimen/tabs_strip_height" - android:background="@color/firstrun_pager_header" + android:background="@android:color/white" android:visibility="visible" android:layout_gravity="top" - gecko:strip="@drawable/home_tab_menu_strip" - gecko:activeTextColor="@color/placeholder_grey" - gecko:inactiveTextColor="@color/tab_text_color" + gecko:strip="@drawable/home_tab_menu_strip_tor" + gecko:activeTextColor="@color/tor_tab_active_text" + gecko:inactiveTextColor="@color/tor_tab_inactive_text" gecko:tabsMarginLeft="@dimen/firstrun_tab_strip_content_start" /> </org.mozilla.gecko.firstrun.FirstrunPager> diff --git a/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml b/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml index 700ab20663ce..6233198982d9 100644 --- a/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml +++ b/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml @@ -13,31 +13,37 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="@dimen/firstrun_min_height" - android:background="@color/about_page_header_grey" + android:background="@android:color/white" android:gravity="center_horizontal" android:orientation="vertical"> - <ImageView android:id="@+id/firstrun_image" - android:layout_width="wrap_content" - android:layout_height="@dimen/firstrun_background_height" - android:layout_marginTop="30dp" - android:layout_marginBottom="18dp" - android:scaleType="fitCenter" - android:layout_gravity="center" - android:adjustViewBounds="true"/> + <LinearLayout android:layout_width="match_parent" + android:layout_height="@dimen/firstrun_background_height" + android:background="@android:color/white" + android:gravity="center" + android:layout_gravity="center"> + + <ImageView android:id="@+id/firstrun_image" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:scaleType="fitCenter" + android:layout_gravity="center" + android:adjustViewBounds="true"/> + </LinearLayout> <TextView android:id="@+id/firstrun_text" android:layout_width="@dimen/firstrun_content_width" android:layout_height="wrap_content" - android:gravity="center" + android:gravity="left" android:textAppearance="@style/TextAppearance.FirstrunLight.Main"/> <TextView android:id="@+id/firstrun_subtext" android:layout_width="@dimen/firstrun_content_width" android:layout_height="wrap_content" android:paddingTop="20dp" - android:gravity="center" - android:textAppearance="@style/TextAppearance.FirstrunRegular.Body"/> + android:gravity="left" + android:lineSpacingExtra="5dp" + android:textAppearance="@style/TextAppearance.FirstrunTorRegular.Body"/> <android.support.v7.widget.SwitchCompat android:id="@+id/firstrun_switch" @@ -47,10 +53,10 @@ android:visibility="invisible"/> <TextView android:id="@+id/firstrun_link" - android:layout_width="wrap_content" + android:layout_width="@dimen/firstrun_content_width" android:layout_height="wrap_content" android:layout_marginBottom="30dp" - android:gravity="center" + android:gravity="left" android:textAppearance="@style/TextAppearance.Link" android:textAllCaps="true" android:text="@string/firstrun_button_next"/> diff --git a/mobile/android/app/src/photon/res/values/colors.xml b/mobile/android/app/src/photon/res/values/colors.xml index 73478f47bf4a..b3522be3c2db 100644 --- a/mobile/android/app/src/photon/res/values/colors.xml +++ b/mobile/android/app/src/photon/res/values/colors.xml @@ -130,7 +130,7 @@ <color name="private_browsing_purple">#CF68FF</color>  - <color name="ob_click">#0A84FF</color> + <color name="ob_click">#7D4698</color> <color name="ob_press">#003EAA</color> <color name="ob_title">#212121</color> <color name="ob_subtitle">#737373</color> @@ -151,6 +151,8 @@ <color name="url_bar_shadow_private">#272727</color> + <color name="tor_tab_inactive_text">#484848</color> + <color name="tor_tab_active_text">#7D4698</color>  <color name="restricted_profile_background_gold">#ffffcb51</color> diff --git a/mobile/android/app/src/photon/res/values/styles.xml b/mobile/android/app/src/photon/res/values/styles.xml index 49e01ee1caee..3330430b22d7 100644 --- a/mobile/android/app/src/photon/res/values/styles.xml +++ b/mobile/android/app/src/photon/res/values/styles.xml @@ -729,6 +729,7 @@ <style name="TextAppearance.FirstrunLight"/> <style name="TextAppearance.FirstrunRegular"/> + <style name="TextAppearance.FirstrunTorRegular"/> <style name="TextAppearance.FirstrunLight.Main"> <item name="android:textSize">20sp</item> @@ -741,6 +742,12 @@ <item name="android:lineSpacingMultiplier">1.25</item> </style> + <style name="TextAppearance.FirstrunTorRegular.Body"> + <item name="android:textSize">16sp</item> + <item name="android:textColor">@color/ob_subtitle</item> + <item name="android:lineSpacingMultiplier">2</item> + </style> + <style name="TextAppearance.Link"> <item name="android:textSize">16sp</item> <item name="android:textColor">@color/ob_click</item> diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunLastPanel.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunLastPanel.java new file mode 100644 index 000000000000..37ccda25d328 --- /dev/null +++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunLastPanel.java @@ -0,0 +1,30 @@ +/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*- + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.gecko.firstrun; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import org.mozilla.gecko.R; + +public class FirstrunLastPanel extends FirstrunPanel { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstance) { + final ViewGroup root = (ViewGroup) super.onCreateView(inflater, container, savedInstance); + + root.findViewById(R.id.firstrun_link).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + close(); + } + }); + + return root; + } +} diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java index 044fe41850d5..48152c60870f 100644 --- a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java +++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java @@ -64,15 +64,7 @@ public class FirstrunPager extends RtlViewPager { } public void load(Context appContext, FragmentManager fm, final FirstrunAnimationContainer.OnFinishListener onFinishListener) { - final List<FirstrunPagerConfig.FirstrunPanelConfig> panels; - - if (Restrictions.isRestrictedProfile(context)) { - panels = FirstrunPagerConfig.getRestricted(); - } else if (FirefoxAccounts.firefoxAccountsExist(context)) { - panels = FirstrunPagerConfig.forFxAUser(appContext); - } else { - panels = FirstrunPagerConfig.getDefault(appContext); - } + final List<FirstrunTorPagerConfig.FirstrunTorPanelConfig> panels = FirstrunTorPagerConfig.getDefault(appContext); setAdapter(new ViewPagerAdapter(fm, panels)); this.pagerNavigation = new FirstrunPanel.PagerNavigation() { @@ -136,14 +128,14 @@ public class FirstrunPager extends RtlViewPager { } protected class ViewPagerAdapter extends FragmentPagerAdapter { - private final List<FirstrunPagerConfig.FirstrunPanelConfig> panels; + private final List<FirstrunTorPagerConfig.FirstrunTorPanelConfig> panels; private final Fragment[] fragments; - public ViewPagerAdapter(FragmentManager fm, List<FirstrunPagerConfig.FirstrunPanelConfig> panels) { + public ViewPagerAdapter(FragmentManager fm, List<FirstrunTorPagerConfig.FirstrunTorPanelConfig> panels) { super(fm); this.panels = panels; this.fragments = new Fragment[panels.size()]; - for (FirstrunPagerConfig.FirstrunPanelConfig panel : panels) { + for (FirstrunTorPagerConfig.FirstrunTorPanelConfig panel : panels) { mDecor.onAddPagerView(context.getString(panel.getTitleRes())); } @@ -156,7 +148,7 @@ public class FirstrunPager extends RtlViewPager { public Fragment getItem(int i) { Fragment fragment = this.fragments[i]; if (fragment == null) { - FirstrunPagerConfig.FirstrunPanelConfig panelConfig = panels.get(i); + FirstrunTorPagerConfig.FirstrunTorPanelConfig panelConfig = panels.get(i); fragment = Fragment.instantiate(context, panelConfig.getClassname(), panelConfig.getArgs()); ((FirstrunPanel) fragment).setPagerNavigation(pagerNavigation); fragments[i] = fragment; diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java new file mode 100644 index 000000000000..40b72e705784 --- /dev/null +++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java @@ -0,0 +1,74 @@ +/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*- + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.gecko.firstrun; + +import android.content.Context; +import android.os.Bundle; +import android.util.Log; +import org.mozilla.gecko.GeckoSharedPrefs; +import org.mozilla.gecko.R; +import org.mozilla.gecko.Telemetry; +import org.mozilla.gecko.TelemetryContract; +import org.mozilla.gecko.Experiments; + +import java.util.LinkedList; +import java.util.List; + +public class FirstrunTorPagerConfig { + public static final String LOGTAG = "FirstrunPagerConfigTor"; + + public static final String KEY_IMAGE = "imageRes"; + public static final String KEY_TEXT = "textRes"; + public static final String KEY_SUBTEXT = "subtextRes"; + + public static List<FirstrunTorPanelConfig> getDefault(Context context) { + final List<FirstrunTorPanelConfig> panels = new LinkedList<>(); + panels.add(SimplePanelConfigs.welcomeTorPanelConfig); + panels.add(SimplePanelConfigs.privacyPanelConfig); + panels.add(SimplePanelConfigs.torNetworkPanelConfig); + panels.add(SimplePanelConfigs.tipsPanelConfig); + panels.add(SimplePanelConfigs.onionServicesPanelConfig); + + return panels; + } + + public static class FirstrunTorPanelConfig { + + private String classname; + private int titleRes; + private Bundle args; + + public FirstrunTorPanelConfig(String classname, int titleRes, int imageRes, int textRes, int subtextRes) { + this.classname = classname; + this.titleRes = titleRes; + + this.args = new Bundle(); + this.args.putInt(KEY_IMAGE, imageRes); + this.args.putInt(KEY_TEXT, textRes); + this.args.putInt(KEY_SUBTEXT, subtextRes); + } + + public String getClassname() { + return this.classname; + } + + public int getTitleRes() { + return this.titleRes; + } + + public Bundle getArgs() { + return args; + } + } + + private static class SimplePanelConfigs { + public static final FirstrunTorPanelConfig welcomeTorPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_welcome_tab_title, R.drawable.figure_welcome, R.string.firstrun_welcome_title, R.string.firstrun_welcome_message); + public static final FirstrunTorPanelConfig privacyPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_privacy_tab_title, R.drawable.figure_privacy, R.string.firstrun_privacy_title, R.string.firstrun_privacy_message); + public static final FirstrunTorPanelConfig torNetworkPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_tornetwork_tab_title, R.drawable.figure_network, R.string.firstrun_tornetwork_title, R.string.firstrun_tornetwork_message); + public static final FirstrunTorPanelConfig tipsPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_tips_tab_title, R.drawable.figure_experience, R.string.firstrun_tips_title, R.string.firstrun_tips_message); + public static final FirstrunTorPanelConfig onionServicesPanelConfig = new FirstrunTorPanelConfig(LastPanel.class.getName(), R.string.firstrun_onionservices_tab_title, R.drawable.figure_onion, R.string.firstrun_onionservices_title, R.string.firstrun_onionservices_message); + } +} diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java index d100c49b3480..c4e4aa0dd96a 100644 --- a/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java +++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java @@ -6,6 +6,7 @@ package org.mozilla.gecko.firstrun; import android.os.Bundle; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -13,8 +14,6 @@ import android.widget.ImageView; import android.widget.TextView; import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; public class LastPanel extends FirstrunPanel { @Override @@ -29,19 +28,19 @@ public class LastPanel extends FirstrunPanel { ((ImageView) root.findViewById(R.id.firstrun_image)).setImageResource(imageRes); ((TextView) root.findViewById(R.id.firstrun_text)).setText(textRes); ((TextView) root.findViewById(R.id.firstrun_subtext)).setText(subtextRes); - ((TextView) root.findViewById(R.id.firstrun_link)).setText(R.string.firstrun_welcome_button_browser); - } + TextView nextLink = (TextView) root.findViewById(R.id.firstrun_link); + nextLink.setText(R.string.firstrun_welcome_button_browser); + nextLink.setGravity(Gravity.CENTER); + root.findViewById(R.id.firstrun_link).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.BUTTON, "firstrun-next"); close(); } }); - return root; } } diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index b4e2296268c1..b9181bb82e1b 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -6,7 +6,7 @@ <!ENTITY firstrun_urlbar_message2 "Thanks for choosing &brandShortName;"> <!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from The Tor Project, the non-profit committed to a free and open web."> <!ENTITY firstrun_panel_title_privacy "Privacy"> -<!ENTITY firstrun_privacy_message "Browse like no one\'s watching"> + <!ENTITY firstrun_privacy_subtext "Private Browsing with Tracking Protection blocks trackers while you browse and won’t remember your history when you finish browsing."> <!ENTITY firstrun_panel_title_customize "Customize"> <!ENTITY firstrun_customize_message "Make &brandShortName; your own."> @@ -43,6 +43,24 @@ <!ENTITY firstrun_account_title "You"> <!ENTITY firstrun_account_message "Have &brandShortName; on another device?"> + +<!ENTITY firstrun_welcome_tab_title "Welcome"> +<!ENTITY firstrun_welcome_title "You\'re ready"> +<!ENTITY firstrun_welcome_message "Tor Browser for Android offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance, and censorship. Here\'s a quick onboarding about how it works."> +<!ENTITY firstrun_privacy_tab_title "Privacy"> +<!ENTITY firstrun_privacy_title "Snub trackers and snoopers"> +<!ENTITY firstrun_privacy_message "Tor Browser isolates each domain you visit. That means trackers and advertisers can’t follow you. And any information stored, such as isolated cookies or your browsing history, is deleted after your session. These modifications ensure your privacy is protected while you\'re browsing. Click \'Tor Network\' to learn how we protect you on the network level."> +<!ENTITY firstrun_tornetwork_tab_title "Tor Network"> +<!ENTITY firstrun_tornetwork_title "Travel a decentralized network"> +<!ENTITY firstrun_tornetwork_message "Tor Browser for Android routes your connection over the Tor network. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, there\'s no single point of failure and no centralized entity you need to trust in order to enjoy the internet, unlike when you use a VPN. For each domain you access, a new circuit through the network is created for you."> +<!ENTITY firstrun_tips_tab_title "Tips"> +<!ENTITY firstrun_tips_title "Experience Tips"> +<!ENTITY firstrun_tips_message "With all the security and privacy features provided by the Tor Browser and the Tor network, your experience while browsing the internet will be a little bit different. Since your connection is going through 3 relays around the world, things may run a bit slower than you\'re used to. Sometimes sites will ask you to prove you are a human, not a robot, and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on providing real privacy."> +<!ENTITY firstrun_onionservices_tab_title "Onion Services"> +<!ENTITY firstrun_onionservices_title "Onion Services"> +<!ENTITY firstrun_onionservices_message "For enhanced privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and +visitors, including added safeguards against censorship. The same way Tor Browser for Android allows you to browse the web with a high degree of privacy onion services allow people to provide content and services privately. You can access .onion sites using Tor Browser for Android."> + <!ENTITY onboard_start_restricted1 "Stay safe and in control with this simplified version of &brandShortName;.">  <string name="firstrun_privacy_subtext">&firstrun_privacy_subtext;</string> <string name="firstrun_panel_title_customize">&firstrun_panel_title_customize;</string> <string name="firstrun_customize_message">&firstrun_customize_message;</string> @@ -51,6 +51,26 @@ <string name="firstrun_welcome_restricted">&onboard_start_restricted1;</string> + <string name="firstrun_welcome_tab_title">&firstrun_welcome_tab_title;</string> + <string name="firstrun_welcome_title">&firstrun_welcome_title;</string> + <string name="firstrun_welcome_message">&firstrun_welcome_message;</string> + + <string name="firstrun_privacy_tab_title">&firstrun_privacy_tab_title;</string> + <string name="firstrun_privacy_title">&firstrun_privacy_title;</string> + <string name="firstrun_privacy_message">&firstrun_privacy_message;</string> + + <string name="firstrun_tornetwork_tab_title">&firstrun_tornetwork_tab_title;</string> + <string name="firstrun_tornetwork_title">&firstrun_tornetwork_title;</string> + <string name="firstrun_tornetwork_message">&firstrun_tornetwork_message;</string> + + <string name="firstrun_tips_tab_title">&firstrun_tips_tab_title;</string> + <string name="firstrun_tips_title">&firstrun_tips_title;</string> + <string name="firstrun_tips_message">&firstrun_tips_message;</string> + + <string name="firstrun_onionservices_tab_title">&firstrun_onionservices_tab_title;</string> + <string name="firstrun_onionservices_title">&firstrun_onionservices_title;</string> + <string name="firstrun_onionservices_message">&firstrun_onionservices_message;</string> + <string name="bookmarks_title">&bookmarks_title;</string> <string name="history_title">&history_title;</string> diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_experience.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_experience.png new file mode 100644 index 000000000000..2eeeb1ccbd7d Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_experience.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_network.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_network.png new file mode 100644 index 000000000000..62bf5e2d144d Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_network.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_onion.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_onion.png new file mode 100644 index 000000000000..cbd8236f82e9 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_onion.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_privacy.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_privacy.png new file mode 100644 index 000000000000..d9d56229aa8a Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_privacy.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_welcome.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_welcome.png new file mode 100644 index 000000000000..274dea5c31a6 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_welcome.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/home_tab_menu_strip_tor.9.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/home_tab_menu_strip_tor.9.png new file mode 100644 index 000000000000..a92420d11b8e Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/home_tab_menu_strip_tor.9.png differ

1 0

[tor-browser-build/master] Bug 27178: add support for xz compression in mar files
by gk＠torproject.org 17 Aug '18

17 Aug '18

commit 93acbf12b01c83facfb6fb023ceff10d9f601b98 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 17 09:35:25 2018 +0200 Bug 27178: add support for xz compression in mar files Add the option `mar_compression` to update_responses_config.yml to select the compression format used in the mar files. Currently we are using bzip2 for the previous alpha, xz for the new alpha, and bzip2 for both the previous and new stable. --- projects/release/update_responses_config.yml | 4 ++++ tools/update-responses/update_responses | 27 +++++++++++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 3f7ff41..90fbc3a 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -47,6 +47,10 @@ versions: minSupportedOSVersion: 6.1 win64: minSupportedOSVersion: 6.1 +[% IF ! c("var/release") -%] + mar_compression: xz +[% END -%] +mar_compression: bzip2 htaccess_rewrite_rules: alpha: | # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 3295808..59cd2ef 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -154,19 +154,24 @@ sub get_version_downloads { } sub extract_mar { - my ($mar_file, $dest_dir) = @_; + my ($mar_file, $dest_dir, $compression) = @_; my $old_cwd = getcwd; mkdir $dest_dir; chdir $dest_dir or exit_error "Cannot enter $dest_dir"; my $res = system('mar', '-x', $mar_file); exit_error "Error extracting $mar_file" if $res; - my $bunzip_file = sub { + if ($compression ne 'bzip2' && $compression ne 'xz') { + exit_error "Unknown compression format $compression"; + } + my $compr_ext = $compression eq 'bzip2' ? 'bz2' : 'xz'; + my $compr_cmd = $compression eq 'bzip2' ? 'bunzip2' : 'unxz'; + my $uncompress_file = sub { return unless -f $File::Find::name; - rename $File::Find::name, "$File::Find::name.bz2"; - system('bunzip2', "$File::Find::name.bz2") == 0 + rename $File::Find::name, "$File::Find::name.$compr_ext"; + system($compr_cmd, "$File::Find::name.$compr_ext") == 0 || exit_error "Error decompressing $File::Find::name"; }; - find($bunzip_file, $dest_dir); + find($uncompress_file, $dest_dir); my $manifest = -f 'updatev3.manifest' ? 'updatev3.manifest' : 'updatev2.manifest'; my @lines = read_file($manifest) if -f $manifest; @@ -208,8 +213,12 @@ sub create_incremental_mar { }; return if $pm->start($finished_file); my $tmpdir = get_tmpdir($config); - extract_mar(mar_filename($config, $appname, $from_version, $os, $lang), "$tmpdir/A"); - extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), "$tmpdir/B"); + my $mar_c_from = get_config($config, $from_version, $os, 'mar_compression'); + my $mar_c_new = get_config($config, $new_version, $os, 'mar_compression'); + extract_mar(mar_filename($config, $appname, $from_version, $os, $lang), + "$tmpdir/A", $mar_c_from); + extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), + "$tmpdir/B", $mar_c_new); # bug 26054: make sure previous macOS version is code signed if (($os eq 'osx64') && ! -f "$tmpdir/A/Contents/_CodeSignature/CodeResources") { exit_error "Missing code signature in $from_version while creating $mar_file"; @@ -279,9 +288,11 @@ sub get_buildinfos { foreach my $lang (keys %{$files->{$os}}) { next unless $files->{$os}{$lang}{complete}; my $tmpdir = get_tmpdir($config); + my $mar_compression = get_config($config, $version, $os, 'mar_compression'); extract_mar( mar_filename($config, $config->{appname_marfile}, $version, $os, $lang), - "$tmpdir"); + "$tmpdir", + $mar_compression); my $appfile = "$tmpdir/application.ini" if -f "$tmpdir/application.ini"; $appfile = "$tmpdir/Contents/Resources/application.ini" if -f "$tmpdir/Contents/Resources/application.ini";

1 0

[tor-browser-build/master] Pick up new Torbutton and TorLauncher tags
by gk＠torproject.org 17 Aug '18

17 Aug '18

commit 6e159020d7121bf4e1a315592c060ba3d8678b41 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 17 07:05:12 2018 +0000 Pick up new Torbutton and TorLauncher tags --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 028f576..fe09b2d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a10' - torbrowser_build: 'build3' + torbrowser_build: 'build5' torbrowser_incremental_from: - 8.0a9 project_name: tor-browser

1 0

[tor-browser-build/master] Bump Torbutton and TorLauncher versions as well
by gk＠torproject.org 17 Aug '18

17 Aug '18

commit b76357d6c719bae1c598475806d8a361eb8f8e65 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 17 07:00:00 2018 +0000 Bump Torbutton and TorLauncher versions as well --- projects/tor-launcher/config | 2 +- projects/torbutton/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 013b897..c0cf724 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.16.1 +version: 0.2.16.2 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index ba53944..4b26ca9 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.1 +version: 2.0.2 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg

1 0

[tor-browser-build/master] Bug 27174: update keyring/torbrowser.gpg to add new subkey
by gk＠torproject.org 17 Aug '18

17 Aug '18

commit 48ff98c88e3359cfd0490acc9a0346b3d0c5bd3a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 16 23:17:10 2018 +0200 Bug 27174: update keyring/torbrowser.gpg to add new subkey --- keyring/torbrowser.gpg | Bin 49267 -> 125669 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbrowser.gpg b/keyring/torbrowser.gpg index dfdee06..4f19dd0 100644 Binary files a/keyring/torbrowser.gpg and b/keyring/torbrowser.gpg differ

1 0

[tor-browser-build/master] Picking up changes for build3
by gk＠torproject.org 16 Aug '18

16 Aug '18

commit 1584f48516deaa01a21c704f625ab7203d5d8ea7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 16 11:42:45 2018 +0000 Picking up changes for build3 Fixed missing items in Changelog, correct sha256sum for new NoScript --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ rbm.conf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index cda434d..5970d71 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -23,6 +23,7 @@ Tor Browser 8.0a10 -- August 20 2018 * Bug 27082: Enable a limited UITour for user onboarding * Bug 26961: New user onboarding * Bug 14952: Enable HTTP2 and AltSvc + * Bug 25735: Tor Browser stalls while loading Facebook login page * Bug 17252: Enable TLS session identifiers with first-party isolation * Bug 26353: Prevent speculative connects that violate first-party isolation * Bug 24056: Use en-US strings in HTML forms if locale is spoofed to english @@ -137,6 +138,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 25894: Get a rust cross-compiler for Windows * Bug 25554: Bump mingw-w64 version for ESR 60 * Bug 23561: Fix nsis builds for Windows 64 + * Bug 13469: Windows installer is missing many languages from NSIS file * Bug 23231: Remove our STL Wrappers workaround for Windows 64bit * Bug 26370: Don't copy msvcr100.dll and libssp-0.dll twice * Bug 26476: Work around Tor Browser crashes due to fix for bug 1467041 diff --git a/rbm.conf b/rbm.conf index 57de6cc..028f576 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a10' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 8.0a9 project_name: tor-browser

1 0

[tor-browser-build/master] Bump the NoScript sha256sum value as well
by gk＠torproject.org 16 Aug '18

16 Aug '18

commit b9f89a7b1224659fda8c2030e261e4e270d7c239 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 16 11:27:47 2018 +0000 Bump the NoScript sha256sum value as well --- projects/tor-browser/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 549df34..66dc989 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -69,7 +69,7 @@ input_files: - filename: Bundle-Data - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: d41f5d36337569d1a1633303d7d07505ab905efba0644e73edccf43edc0d39e0 + sha256sum: fdc539412a61e6109b9fd331c90bd73faa787eefe1ee8d06b57dc3d906c541cd - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Bump tor-browser tag as well
by gk＠torproject.org 16 Aug '18

16 Aug '18

commit 9901f022a04ab63aa84e3d41736b66d45e524efd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 16 10:38:45 2018 +0000 Bump tor-browser tag as well --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 7546d24..2da425a 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg

1 0

[tor-browser-build/master] Picking up tor-browser tag bump for build2
by gk＠torproject.org 16 Aug '18

16 Aug '18

commit a8379c78e34dde020bbd3d123298ceff9e43bd13 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 16 10:39:30 2018 +0000 Picking up tor-browser tag bump for build2 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index f0ea58e..57de6cc 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a10' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.0a9 project_name: tor-browser

1 0

[tor-browser-build/master] Bump NoScript version to 10.1.8.16
by gk＠torproject.org 16 Aug '18

16 Aug '18

commit c28ce61d5429ca305934c78c900d129570590fae Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 16 08:27:36 2018 +0000 Bump NoScript version to 10.1.8.16 --- projects/tor-browser/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index e421dfe..549df34 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -67,7 +67,7 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript sha256sum: d41f5d36337569d1a1633303d7d07505ab905efba0644e73edccf43edc0d39e0 - filename: 'RelativeLink/start-tor-browser.desktop'

1 0