Matthew Finkel pushed to branch tor-browser-84.0.0b2-10.5-1 at The Tor Project / Applications / fenix Commits: 5ad0f655 by Matthew Finkel at 2020-12-01T21:49:39+00:00 Add Security Level UI Bug 40026: Implement Security Level settings Bug 40026: Integrate Security Level settings - - - - - 6c98973b by Matthew Finkel at 2020-12-01T21:52:52+00:00 Bug 40098: Add EOY home screen - - - - - 22 changed files: - LICENSE - app/src/main/java/org/mozilla/fenix/components/Core.kt - app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt - app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - + app/src/main/java/org/mozilla/fenix/settings/TorSecurityLevelFragment.kt - app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt - + app/src/main/java/org/mozilla/fenix/tor/SecurityLevel.kt - app/src/main/java/org/mozilla/fenix/utils/Settings.kt - + app/src/main/res/drawable/ic_illo.png - + app/src/main/res/drawable/ic_tape.png - + app/src/main/res/font/cousine.ttf - + app/src/main/res/font/terminal_grotesque.otf - + app/src/main/res/font/white_on_black.ttf - app/src/main/res/layout/fragment_home.xml - app/src/main/res/layout/tor_onboarding_security_level.xml - app/src/main/res/navigation/nav_graph.xml - app/src/main/res/values/styles.xml - app/src/main/res/values/torbrowser_strings.xml - app/src/main/res/xml/preferences.xml - + app/src/main/res/xml/tor_security_level_preferences.xml Changes: ===================================== LICENSE ===================================== @@ -371,3 +371,328 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. + +=============================================================================== + +"White On Black" font embedded in chrome/skin/aboutTorFonts.css is licensed under: + +Non Exclusive License Agreement + +Object: Imagex font called « White on Black » +Owner: Daniel Hochard + +1. Allowed uses +The user may use this font on any surface such as logo, paper, web sites, +textile, Online medias, except TV, cinéma and advertising campaign. +2. Number of users : 5 +All users must belong to the same company or household purchasing the font. +3. Modifications +The user can modify this font itself without written consent of the owner. +4. This font belongs to Daniel Hochard. The user may not sell it as a font (in a +font bank or a commercial fonts web site, for example). +The fee for this font was paid on paypal the 29 september 2020 + +=============================================================================== + +"Terminal Grotesque Open" font embedded in chrome/skin/aboutTorFonts.css is licensed +under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +=============================================================================== + +SIL OPEN FONT LICENSE + +Version 1.1 - 26 February 2007 + +PREAMBLE + +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. +DEFINITIONS + +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting — in part or in whole — any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. +PERMISSION & CONDITIONS + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. +TERMINATION + +This license becomes null and void if any of the above conditions are +not met. +DISCLAIMER + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + +=============================================================================== + +The Cousine font is licensed under the Apache License, Version 2.0. +https://fonts.google.com/specimen/Cousine + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. ===================================== app/src/main/java/org/mozilla/fenix/components/Core.kt ===================================== @@ -110,6 +110,7 @@ class Core( context, R.color.foundation_normal_theme ), + torSecurityLevel = context.settings().torSecurityLevel().intRepresentation, spoofEnglish = context.settings().spoofEnglish ) ===================================== app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -72,6 +72,7 @@ import mozilla.components.feature.top.sites.TopSitesFeature import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.support.base.feature.ViewBoundFeatureWrapper import mozilla.components.support.ktx.android.content.res.resolveAttribute +import mozilla.components.support.locale.LocaleManager import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.HomeActivity @@ -99,6 +100,7 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.topsites.DefaultTopSitesView import org.mozilla.fenix.onboarding.FenixOnboarding import org.mozilla.fenix.settings.SupportUtils +import org.mozilla.fenix.settings.advanced.getSelectedLocale import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit import org.mozilla.fenix.tor.bootstrap.TorQuickStart import org.mozilla.fenix.theme.ThemeManager @@ -265,6 +267,28 @@ class HomeFragment : Fragment() { adjustHomeFragmentView(currentMode.getCurrentMode(), view) showSessionControlView(view) + view.donationmatch.setOnClickListener { + activity.openToBrowserAndLoad( + searchTermOrURL = "https://blog.torproject.org/friends-of-tor-match-2020", + newTab = true, + from = BrowserDirection.FromHome + ) + } + + view.donate_now_button.setOnClickListener { + val country = LocaleManager.getSelectedLocale(requireContext()).country + var locale = LocaleManager.getSelectedLocale(requireContext()).language + if (country != "") { + locale = "$locale-$country" + } + val localeUrl = "https://www.torproject.org/donate/donate-usetor-mobile-$locale" + activity.openToBrowserAndLoad( + searchTermOrURL = localeUrl, + newTab = true, + from = BrowserDirection.FromHome + ) + } + return view } @@ -396,6 +420,14 @@ class HomeFragment : Fragment() { toolbarLayoutHeight - SESSION_CONTROL_VIEW_PADDING ) } + view.donate_now_button?.apply { + (layoutParams as ViewGroup.MarginLayoutParams).setMargins( + 0, + 0, + 0, + toolbarLayoutHeight - SESSION_CONTROL_VIEW_PADDING + ) + } } } else { view.sessionControlRecyclerView?.apply { @@ -406,6 +438,38 @@ class HomeFragment : Fragment() { height - SESSION_CONTROL_VIEW_PADDING ) } + view.donate_now_button?.apply { + (layoutParams as ViewGroup.MarginLayoutParams).setMargins( + 0, + 0, + 0, + height - SESSION_CONTROL_VIEW_PADDING + ) + } + } + } + + // Hide the EOY image during Onboarding, too. + view?.illo_image?.apply { + visibility = if (onboarding.userHasBeenOnboarded()) { + View.VISIBLE + } else { + View.GONE + } + } + // Hide the EOY donate button during Onboarding, too. + view?.donate_now_button?.apply { + visibility = if (onboarding.userHasBeenOnboarded()) { + View.VISIBLE + } else { + View.GONE + } + } + view?.resistsurveillance?.apply { + visibility = if (onboarding.userHasBeenOnboarded()) { + View.VISIBLE + } else { + View.GONE } } // Hide the onion pattern during Onboarding, too. ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt ===================================== @@ -411,6 +411,8 @@ class DefaultSessionControlController( } override fun handleOpenSecurityLevelSettingsClicked() { + val directions = HomeFragmentDirections.actionGlobalTorSecurityLevelFragment() + navController.nav(R.id.homeFragment, directions) } override fun handleWhatsNewGetAnswersClicked() { ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt ===================================== @@ -8,8 +8,11 @@ import android.view.View import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.tor_onboarding_security_level.view.* import org.mozilla.fenix.R +import org.mozilla.fenix.ext.components import org.mozilla.fenix.home.sessioncontrol.OnboardingInteractor import org.mozilla.fenix.onboarding.OnboardingRadioButton +import org.mozilla.fenix.tor.SecurityLevel +import org.mozilla.fenix.tor.SecurityLevelUtil import org.mozilla.fenix.utils.view.addToRadioGroup class TorOnboardingSecurityLevelViewHolder( @@ -33,34 +36,56 @@ class TorOnboardingSecurityLevelViewHolder( ) view.open_settings_button.setOnClickListener { - interactor.onOpenSettingsClicked() + interactor.onOpenSecurityLevelSettingsClicked() } - setupRadioGroup() + setupRadioGroup(view) } - private fun setupRadioGroup() { + private fun setupRadioGroup(view: View) { addToRadioGroup(standardSecurityLevel, saferSecurityLevel, safestSecurityLevel) - standardSecurityLevel.isChecked = true - safestSecurityLevel.isChecked = false - saferSecurityLevel.isChecked = false + val securityLevel = try { + SecurityLevelUtil.getSecurityLevelFromInt( + view.context.components.core.engine.settings.torSecurityLevel + ) + } catch (e: IllegalStateException) { + SecurityLevel.STANDARD + } + + standardSecurityLevel.isChecked = securityLevel == SecurityLevel.STANDARD + safestSecurityLevel.isChecked = securityLevel == SecurityLevel.SAFEST + saferSecurityLevel.isChecked = securityLevel == SecurityLevel.SAFER standardSecurityLevel.onClickListener { - updateSecurityLevel() + updateSecurityLevel(SecurityLevel.STANDARD) } saferSecurityLevel.onClickListener { - updateSecurityLevel() + updateSecurityLevel(SecurityLevel.SAFER) } safestSecurityLevel.onClickListener { - updateSecurityLevel() + updateSecurityLevel(SecurityLevel.SAFEST) } + + updateSecurityLevel(securityLevel) } - private fun updateSecurityLevel() { + private fun updateSecurityLevel(newLevel: SecurityLevel) { + val resources = itemView.context.resources + val securityLevel = when (newLevel) { + SecurityLevel.STANDARD -> resources.getString(R.string.tor_security_level_standard_option) + SecurityLevel.SAFER -> resources.getString(R.string.tor_security_level_safer_option) + SecurityLevel.SAFEST -> resources.getString(R.string.tor_security_level_safest_option) + } + itemView.current_level.text = resources.getString( + R.string.tor_onboarding_chosen_security_level_label, securityLevel + ) + itemView.context.components.let { + it.core.engine.settings.torSecurityLevel = newLevel.intRepresentation + } } companion object { ===================================== app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt ===================================== @@ -224,6 +224,9 @@ class SettingsFragment : PreferenceFragmentCompat() { resources.getString(R.string.pref_key_tor_network_settings) -> { SettingsFragmentDirections.actionSettingsFragmentToTorNetworkSettingsFragment() } + resources.getString(R.string.pref_key_tor_security_level_settings) -> { + SettingsFragmentDirections.actionSettingsFragmentToTorSecurityLevelFragment() + } resources.getString(R.string.pref_key_tracking_protection_settings) -> { requireContext().metrics.track(Event.TrackingProtectionSettings) SettingsFragmentDirections.actionSettingsFragmentToTrackingProtectionFragment() ===================================== app/src/main/java/org/mozilla/fenix/settings/TorSecurityLevelFragment.kt ===================================== @@ -0,0 +1,86 @@ +/* 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.fenix.settings + +import android.os.Bundle +import androidx.preference.PreferenceFragmentCompat +import org.mozilla.fenix.R +import org.mozilla.fenix.ext.components +import org.mozilla.fenix.ext.settings +import org.mozilla.fenix.ext.showToolbar +import org.mozilla.fenix.tor.SecurityLevel +import org.mozilla.fenix.tor.SecurityLevelUtil +import org.mozilla.fenix.utils.view.GroupableRadioButton +import org.mozilla.fenix.utils.view.addToRadioGroup +import org.mozilla.fenix.utils.view.uncheckAll + +/** + * Lets the user choose their security level + */ +@Suppress("SpreadOperator") +class TorSecurityLevelFragment : PreferenceFragmentCompat() { + private val securityLevelRadioGroups = mutableListOf<GroupableRadioButton>() + private var previousSecurityLevel: SecurityLevel? = null + + override fun onResume() { + super.onResume() + showToolbar(getString(R.string.preferences_tor_security_level_options)) + } + + override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { + setPreferencesFromResource(R.xml.tor_security_level_preferences, rootKey) + + val currentLevel: SecurityLevel? = context?.components?.let { + try { + SecurityLevelUtil.getSecurityLevelFromInt( + it.core.engine.settings.torSecurityLevel + ) + } catch (e: IllegalStateException) { + // The default state is 0. If we get an invalid state then + // default to Standard (4). + SecurityLevel.STANDARD + } + } + + if (currentLevel == null) { + throw IllegalStateException("context or Components is null.") + } + + val radioSafer = bindSecurityLevelRadio(SecurityLevel.SAFER) + val radioSafest = bindSecurityLevelRadio(SecurityLevel.SAFEST) + val radioStandard = bindSecurityLevelRadio(SecurityLevel.STANDARD) + + securityLevelRadioGroups.addAll(mutableListOf(radioSafer, radioSafest, radioStandard)) + // `*` is Kotlin's "spread" operator, for expanding an Array as a vararg. + addToRadioGroup(*securityLevelRadioGroups.toTypedArray()) + + securityLevelRadioGroups.uncheckAll() + val securityLevelRadioButton = requirePreference<RadioButtonPreference>(currentLevel.preferenceKey) + // Cache this for later comparison in the OnPreferenceChangeListener + previousSecurityLevel = currentLevel + securityLevelRadioButton.setCheckedWithoutClickListener(true) + } + + private fun bindSecurityLevelRadio( + level: SecurityLevel + ): RadioButtonPreference { + val radio = requirePreference<RadioButtonPreference>(level.preferenceKey) + + radio.summary = getString(level.contentDescriptionRes) + + radio.apply { + setOnPreferenceChangeListener<Boolean> { preference, isChecked -> + if (isChecked && (previousSecurityLevel!! != level)) { + preference.context.components.core.engine.settings.torSecurityLevel = + level.intRepresentation + previousSecurityLevel = level + } + true + } + } + + return radio + } +} ===================================== app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt ===================================== @@ -32,7 +32,7 @@ abstract class ThemeManager { @get:StyleRes val currentThemeResource get() = when (currentTheme) { BrowsingMode.Normal -> R.style.NormalTheme - BrowsingMode.Private -> R.style.PrivateTheme + BrowsingMode.Private -> R.style.PrivateEOYTheme } /** ===================================== app/src/main/java/org/mozilla/fenix/tor/SecurityLevel.kt ===================================== @@ -0,0 +1,51 @@ +/* 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.fenix.tor + +import android.os.Parcelable +import androidx.annotation.StringRes +import kotlinx.android.parcel.Parcelize +import org.mozilla.fenix.R + +@Parcelize +enum class SecurityLevel( + @StringRes val preferenceKey: Int, + @StringRes val contentDescriptionRes: Int, + val intRepresentation: Int +) : Parcelable { + + STANDARD( + preferenceKey = R.string.pref_key_tor_security_level_standard_option, + contentDescriptionRes = R.string.tor_security_level_standard_description, + intRepresentation = SecurityLevel.SECURITY_LEVEL_STANDARD + ), + SAFER( + preferenceKey = R.string.pref_key_tor_security_level_safer_option, + contentDescriptionRes = R.string.tor_security_level_safer_description, + intRepresentation = SecurityLevel.SECURITY_LEVEL_SAFER + ), + SAFEST( + preferenceKey = R.string.pref_key_tor_security_level_safest_option, + contentDescriptionRes = R.string.tor_security_level_safest_description, + intRepresentation = SecurityLevel.SECURITY_LEVEL_SAFEST + ); + + companion object { + const val SECURITY_LEVEL_STANDARD = 4 + const val SECURITY_LEVEL_SAFER = 2 + const val SECURITY_LEVEL_SAFEST = 1 + } +} + +object SecurityLevelUtil { + fun getSecurityLevelFromInt(level: Int): SecurityLevel { + return when (level) { + SecurityLevel.SECURITY_LEVEL_STANDARD -> SecurityLevel.STANDARD + SecurityLevel.SECURITY_LEVEL_SAFER -> SecurityLevel.SAFER + SecurityLevel.SECURITY_LEVEL_SAFEST -> SecurityLevel.SAFEST + else -> throw IllegalStateException("Security Level $level is not valid") + } + } +} ===================================== app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -40,6 +40,7 @@ import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitTyp import org.mozilla.fenix.settings.logins.SavedLoginsSortingStrategyMenu import org.mozilla.fenix.settings.logins.SortingStrategy import org.mozilla.fenix.settings.registerOnSharedPreferenceChangeListener +import org.mozilla.fenix.tor.SecurityLevel import java.security.InvalidParameterException private const val AUTOPLAY_USER_SETTING = "AUTOPLAY_USER_SETTING" @@ -174,6 +175,33 @@ class Settings(private val appContext: Context) : PreferencesHolder { false ) + var standardSecurityLevel by booleanPreference( + appContext.getPreferenceKey(SecurityLevel.STANDARD.preferenceKey), + default = true + ) + + var saferSecurityLevel by booleanPreference( + appContext.getPreferenceKey(SecurityLevel.SAFER.preferenceKey), + default = false + ) + + var safestSecurityLevel by booleanPreference( + appContext.getPreferenceKey(SecurityLevel.SAFEST.preferenceKey), + default = false + ) + + // torSecurityLevel is defined as the first |true| preference, + // beginning at the safest level. + // If multiple preferences are true, then that is a bug and the + // highest |true| security level is chosen. + // Standard is the default level. + fun torSecurityLevel(): SecurityLevel = when { + safestSecurityLevel -> SecurityLevel.SAFEST + saferSecurityLevel -> SecurityLevel.SAFER + standardSecurityLevel -> SecurityLevel.STANDARD + else -> SecurityLevel.STANDARD + } + var spoofEnglish by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_spoof_english), default = false ===================================== app/src/main/res/drawable/ic_illo.png ===================================== Binary files /dev/null and b/app/src/main/res/drawable/ic_illo.png differ ===================================== app/src/main/res/drawable/ic_tape.png ===================================== Binary files /dev/null and b/app/src/main/res/drawable/ic_tape.png differ ===================================== app/src/main/res/font/cousine.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/cousine.ttf differ ===================================== app/src/main/res/font/terminal_grotesque.otf ===================================== Binary files /dev/null and b/app/src/main/res/font/terminal_grotesque.otf differ ===================================== app/src/main/res/font/white_on_black.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/white_on_black.ttf differ ===================================== app/src/main/res/layout/fragment_home.xml ===================================== @@ -53,6 +53,7 @@ android:clickable="false" android:contentDescription="@string/app_name" android:focusable="false" + android:visibility="gone" android:importantForAccessibility="no" app:srcCompat="@mipmap/ic_launcher" app:layout_collapseMode="parallax" @@ -69,6 +70,7 @@ android:height="60dp" android:clickable="false" android:focusable="false" + android:visibility="gone" android:importantForAccessibility="no" android:lines="2" android:text="@string/app_name" @@ -83,19 +85,99 @@ android:id="@+id/exploreprivately" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center|center_vertical" - android:gravity="center_horizontal" + android:layout_gravity="center_vertical" + android:layout_marginStart="30dp" + android:layout_marginEnd="30dp" android:clickable="false" android:ellipsize="end" android:focusable="false" android:importantForAccessibility="no" - android:text="@string/tor_explore_privately" - android:fontFamily="Roboto-Medium" - android:textColor="#DEFFFFFF" + android:text="@string/tor_useamask_usetor" + android:fontFamily="@font/white_on_black" + android:textColor="#FFFFFFFF" android:textSize="40sp" + android:paddingTop="20dp" android:lineSpacingMultiplier="1.1" app:layout_scrollFlags="scroll" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:orientation="vertical"> + + <TextView + android:id="@+id/resistsurveillance" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="40dp" + android:layout_gravity="center_vertical" + android:clickable="false" + android:focusable="false" + android:gravity="start" + android:fontFamily="@font/terminal_grotesque" + android:importantForAccessibility="no" + android:lineSpacingMultiplier="1.1" + android:text="@string/tor_resistsurveillance" + android:textColor="#FFFFFFFF" + android:textSize="27sp" + android:visibility="visible" + app:layout_scrollFlags="scroll" /> + + <TextView + android:id="@+id/donationmatch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="40dp" + android:layout_gravity="center_vertical" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:clickable="false" + android:focusable="false" + android:gravity="start" + android:fontFamily="@font/cousine" + android:importantForAccessibility="no" + android:lineSpacingMultiplier="1.1" + android:text="@string/tor_donationmatch" + android:textColor="#9D4AE8" + android:textSize="14sp" + android:visibility="visible" + app:layout_scrollFlags="scroll" /> + + <Button + android:id="@+id/donate_now_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="30dp" + android:background="@drawable/ic_tape" + android:gravity="center|start" + android:fontFamily="@font/terminal_grotesque" + android:paddingStart="15dp" + android:paddingEnd="20dp" + android:text="@string/tor_onboarding_donate_button" + android:textColor="#FF000000" + android:textSize="25sp" + android:textAllCaps="false" + android:textStyle="bold" + android:visibility="visible" + tools:ignore="ButtonStyleXmlDetector" /> + </LinearLayout> + + <ImageView + android:id="@+id/illo_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + app:srcCompat="@drawable/ic_illo" + tools:ignore="ContentDescription" + app:layout_scrollFlags="scroll" /> + + </LinearLayout> + </com.google.android.material.appbar.AppBarLayout> <androidx.recyclerview.widget.RecyclerView ===================================== app/src/main/res/layout/tor_onboarding_security_level.xml ===================================== @@ -32,9 +32,18 @@ android:textAppearance="@style/Body14TextStyle" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/header_text" + app:layout_constraintTop_toBottomOf="@id/current_level" tools:text="@string/tor_onboarding_security_level_description" /> + <TextView + android:id="@+id/current_level" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="12dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/header_text" + tools:text="@string/tor_onboarding_chosen_security_level_label" /> <org.mozilla.fenix.onboarding.OnboardingRadioButton android:id="@+id/security_level_standard_option" ===================================== app/src/main/res/navigation/nav_graph.xml ===================================== @@ -58,6 +58,9 @@ <action android:id="@+id/action_global_syncedTabsFragment" app:destination="@id/syncedTabsFragment" /> + <action + android:id="@+id/action_global_torSecurityLevelFragment" + app:destination="@id/torSecurityLevelFragment" /> <action android:id="@+id/action_global_privateBrowsingFragment" app:destination="@id/privateBrowsingFragment" /> @@ -473,6 +476,13 @@ app:exitAnim="@anim/slide_out_left" app:popEnterAnim="@anim/slide_in_left" app:popExitAnim="@anim/slide_out_right" /> + <action + android:id="@+id/action_settingsFragment_to_torSecurityLevelFragment" + app:destination="@id/torSecurityLevelFragment" + app:enterAnim="@anim/slide_in_right" + app:exitAnim="@anim/slide_out_left" + app:popEnterAnim="@anim/slide_in_left" + app:popExitAnim="@anim/slide_out_right" /> <action android:id="@+id/action_settingsFragment_to_privateBrowsingFragment" app:destination="@id/privateBrowsingFragment" @@ -632,6 +642,10 @@ android:id="@+id/customizationFragment" android:name="org.mozilla.fenix.settings.CustomizationFragment" android:label="@string/preferences_customize" /> + <fragment + android:id="@+id/torSecurityLevelFragment" + android:name="org.mozilla.fenix.settings.TorSecurityLevelFragment" + android:label="@string/preferences_tor_security_level_settings" /> <fragment android:id="@+id/privateBrowsingFragment" android:name="org.mozilla.fenix.settings.PrivateBrowsingFragment" ===================================== app/src/main/res/values/styles.xml ===================================== @@ -269,6 +269,10 @@ <style name="PrivateTheme" parent="PrivateThemeBase" /> + <style name="PrivateEOYTheme" parent="PrivateThemeBase" > + <item name="homeBackground">@android:color/black</item> + </style> + <!-- Fade animation for theme switching --> <style name="WindowAnimationTransition"> <item name="android:windowEnterAnimation">@anim/fade_in</item> ===================================== app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -23,6 +23,7 @@ <string name="tor_onboarding_security_level">Set your Security Level</string> <string name="tor_onboarding_security_level_description">Disable certain web features that can be used to attack you, and harm your security, anonymity, and privacy.</string> + <string name="tor_onboarding_chosen_security_level_label">Current Security Level: %s</string> <string name="tor_onboarding_security_settings_button">Open Security Settings</string> <string name="tor_onboarding_donate_header">Donate and keep Tor safe</string> <string name="tor_onboarding_donate_description">Tor is free to use because of donations from people like you.</string> @@ -57,6 +58,10 @@ <string name="preferences_tor_network_settings_restarting">Restarting</string> <string name="preferences_tor_network_settings_bridges_enabled">Bridges are enabled: %s</string> + <!-- Preference title for security level settings --> + <string name="preferences_tor_security_level_settings">Security Settings</string> + <string name="preferences_tor_security_level_options">Security Level</string> + <!-- Description of security levels --> <string name="tor_security_level_standard_option">Standard</string> <string name="tor_security_level_standard_description">All Tor Browser and website features are enabled.</string> @@ -67,4 +72,8 @@ <!-- Spoof locale to English --> <string name="tor_spoof_english">Request English versions of web pages for enhanced privacy</string> + + <string name="tor_useamask_usetor">Use a mask, use Tor.</string> + <string name="tor_resistsurveillance">Resist the surveillance pandemic.</string> + <string name="tor_donationmatch">Your donation will be matched by Friends of Tor.</string> </resources> ===================================== app/src/main/res/xml/preferences.xml ===================================== @@ -89,6 +89,11 @@ app:iconSpaceReserved="false" android:layout="@layout/preference_cat_style"> + <androidx.preference.Preference + android:icon="@drawable/ic_tracking_protection_enabled" + android:key="@string/pref_key_tor_security_level_settings" + android:title="@string/preferences_tor_security_level_settings"/> + <androidx.preference.Preference android:icon="@drawable/ic_private_browsing" android:key="@string/pref_key_private_browsing" ===================================== app/src/main/res/xml/tor_security_level_preferences.xml ===================================== @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?><!-- 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/. --> +<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <org.mozilla.fenix.settings.RadioButtonPreference + android:defaultValue="true" + android:key="@string/pref_key_tor_security_level_standard_option" + android:summary="@string/tor_security_level_standard_description" + android:title="@string/tor_security_level_standard_option" /> + <org.mozilla.fenix.settings.RadioButtonPreference + android:defaultValue="false" + android:key="@string/pref_key_tor_security_level_safer_option" + android:summary="@string/tor_security_level_safer_description" + android:title="@string/tor_security_level_safer_option" /> + <org.mozilla.fenix.settings.RadioButtonPreference + android:defaultValue="false" + android:key="@string/pref_key_tor_security_level_safest_option" + android:summary="@string/tor_security_level_safest_description" + android:title="@string/tor_security_level_safest_option" /> +</androidx.preference.PreferenceScreen> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/4f455e45aa2d8... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/4f455e45aa2d8... You're receiving this email because of your account on gitlab.torproject.org.