Commit dbb92015 authored by Matthew Finkel's avatar Matthew Finkel
Browse files

fixup! Bug 40028: Implement Tor Onboarding

parent c211ca85

app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ class TorOnboardingSecurityLevelViewHolder( 
    init {

        view.header_text.setOnboardingIcon(R.drawable.ic_onboarding_tracking_protection)



        standardSecurityLevel = view.security_level_standard_default

        standardSecurityLevel = view.security_level_standard_option

        saferSecurityLevel = view.security_level_safer_option

        safestSecurityLevel = view.security_level_safest_option

app/src/main/res/layout/tor_onboarding_security_level.xml

+9 −9
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 




    <org.mozilla.fenix.onboarding.OnboardingRadioButton

        android:id="@+id/security_level_standard_default"

        android:id="@+id/security_level_standard_option"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginStart="16dp"
@@ -52,9 +52,9 @@ 
        android:theme="@style/Checkable.Colored"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@id/description_text"

        app:onboardingKey="@string/pref_key_tor_security_level_standard_default"

        app:onboardingKeyDescription="@string/tor_onboarding_security_level_standard_button_description"

        app:onboardingKeyTitle="@string/tor_onboarding_security_level_standard_option"

        app:onboardingKey="@string/pref_key_tor_security_level_standard_option"

        app:onboardingKeyDescription="@string/tor_security_level_standard_description"

        app:onboardingKeyTitle="@string/tor_security_level_standard_option"

        tools:text="Standard" />



    <org.mozilla.fenix.onboarding.OnboardingRadioButton
@@ -73,10 +73,10 @@ 
        android:textColor="@color/primary_state_list_text_color"

        android:theme="@style/Checkable.Colored"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@id/security_level_standard_default"

        app:layout_constraintTop_toBottomOf="@id/security_level_standard_option"

        app:onboardingKey="@string/pref_key_tor_security_level_safer_option"

        app:onboardingKeyDescription="@string/tor_onboarding_security_level_safer_button_description"

        app:onboardingKeyTitle="@string/tor_onboarding_security_level_safer_option"

        app:onboardingKeyDescription="@string/tor_security_level_safer_description"

        app:onboardingKeyTitle="@string/tor_security_level_safer_option"

        tools:text="Safer" />



    <org.mozilla.fenix.onboarding.OnboardingRadioButton
@@ -97,8 +97,8 @@ 
        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@id/security_level_safer_option"

        app:onboardingKey="@string/pref_key_tor_security_level_safest_option"

        app:onboardingKeyDescription="@string/tor_onboarding_security_level_safest_button_description"

        app:onboardingKeyTitle="@string/tor_onboarding_security_level_safest_option"

        app:onboardingKeyDescription="@string/tor_security_level_safest_description"

        app:onboardingKeyTitle="@string/tor_security_level_safest_option"

        tools:text="Safest" />



    <Button

app/src/main/res/values/preference_keys.xml

+1 −1
Original line number Diff line number Diff line
@@ -223,10 +223,10 @@ 
    <string name="pref_key_noscript_installed" translatable="false">pref_key_noscript_installed</string>



    <!-- Security Level Settings -->

    <string name="pref_key_tor_security_level_settings" translatable="false">pref_key_tor_security_level_settings</string>

    <string name="pref_key_tor_security_level_standard_default" translatable="false">pref_key_tor_security_level_standard_default</string>

    <string name="pref_key_tor_security_level_safer_option" translatable="false">pref_key_tor_security_level_safer_option</string>

    <string name="pref_key_tor_security_level_safest_option" translatable="false">pref_key_tor_security_level_safest_option</string>

    <string name="pref_key_tor_security_level_custom_option" translatable="false">pref_key_tor_security_level_custom_option</string>



    <string name="pref_key_tor_network_settings" translatable="false">pref_key_tor_network_settings</string>

    <string name="pref_key_tor_network_settings_explanation" translatable="false">pref_key_tor_network_settings_explanation</string>

app/src/main/res/values/torbrowser_strings.xml

+9 −6
Original line number Diff line number Diff line
@@ -20,12 +20,6 @@ 


    <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_security_level_standard_option">Standard</string>

    <string name="tor_onboarding_security_level_standard_button_description">All Tor Browser and website features are enabled.</string>

    <string name="tor_onboarding_security_level_safer_option">Safer</string>

    <string name="tor_onboarding_security_level_safer_button_description">Disable website features that are often dangerous, causing some sites to lose functionality.</string>

    <string name="tor_onboarding_security_level_safest_option">Safest</string>

    <string name="tor_onboarding_security_level_safest_button_description">Only allow website features required for static sites and basic services. These changes affect images, media, and scripts.</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>
@@ -59,4 +53,13 @@ 
    <string name="preferences_tor_network_settings_connected">Connected</string>

    <string name="preferences_tor_network_settings_restarting">Restarting</string>

    <string name="preferences_tor_network_settings_bridges_enabled">Bridges are enabled: %s</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>

    <string name="tor_security_level_safer_option">Safer</string>

    <string name="tor_security_level_safer_description">Disable website features that are often dangerous, causing some sites to lose functionality.</string>

    <string name="tor_security_level_safest_option">Safest</string>

    <string name="tor_security_level_safest_description">Only allow website features required for static sites and basic services. These changes affect images, media, and scripts.</string>



</resources>