Commit b23a826c authored by clairehurst's avatar clairehurst 🌱 Committed by Dan Ballard
Browse files

fixup! TB 40041 [android]: Implement Tor Network Settings

parent eb9525d5

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt

+11 −0
Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -796,6 +796,17 @@ class SettingsFragment : PreferenceFragmentCompat(), UserInteractionHandler { 
                true

            }

        }

        requirePreference<Preference>(R.string.pref_key_about_config_shortcut).apply {

            isVisible = requireContext().settings().showSecretDebugMenuThisSession || Config.channel == ReleaseChannel.Debug

            setOnPreferenceClickListener {

                (requireActivity() as HomeActivity).openToBrowserAndLoad(

                    searchTermOrURL = "about:config",

                    from = BrowserDirection.FromSettings,

                    newTab = true,

                )

                true

            }

        }

    }



    @VisibleForTesting

mobile/android/fenix/app/src/main/res/values/preference_keys.xml

+1 −0
Changes for mobile/android/fenix/app/src/main/res/values/preference_keys.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ 
    <string name="pref_key_tor_network_settings_bridge_config" translatable="false">pref_key_tor_network_settings_bridge_config</string>

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

    <string name="pref_key_use_html_connection_ui" translatable="false">pref_key_use_html_connection_ui</string> <!-- Changing the pref_key should reset it to off for users that had it enabled   -->

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

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

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

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

mobile/android/fenix/app/src/main/res/xml/preferences.xml

+6 −0
Changes for mobile/android/fenix/app/src/main/res/xml/preferences.xml: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -194,6 +194,12 @@ 
            android:title="@string/preferences_tor_logs"

            android:summary="@string/preferences_tor_logs_description" />



        <Preference

            android:key="@string/pref_key_about_config_shortcut"

            app:iconSpaceReserved="false"

            android:title="about:config"/>





        <!-- Auto connect -->



        <!-- Tor Logs -->