Commit 7c3fa2a5 authored by clairehurst's avatar clairehurst 🌱 Committed by Pier Angelo Vendrame
Browse files

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

TB 44842: Replace instances of SwitchPreference with SwitchPreferenceCompat
parent baa6ae3a

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

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import android.os.Bundle 
import androidx.preference.EditTextPreference

import androidx.preference.Preference

import androidx.preference.PreferenceFragmentCompat

import androidx.preference.SwitchPreference

import androidx.preference.SwitchPreferenceCompat

import org.mozilla.fenix.Config

import org.mozilla.fenix.R

import org.mozilla.fenix.ext.components
@@ -50,7 +50,7 @@ class TorBridgeConfigFragment : PreferenceFragmentCompat() { 
        val bridgesEnabled = requireContext().components.torController.bridgesEnabled



        val prefBridgeConfig =

            requirePreference<SwitchPreference>(R.string.pref_key_tor_network_settings_bridge_config_toggle)

            requirePreference<SwitchPreferenceCompat>(R.string.pref_key_tor_network_settings_bridge_config_toggle)

        prefBridgeConfig.apply {

            isChecked = bridgesEnabled

            setOnPreferenceChangeListener<Boolean> { preference, enabled ->

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

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ 
            android:title="@string/preferences_tor_network_settings_bridge_config"

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



        <SwitchPreference

        <SwitchPreferenceCompat

            android:key="@string/pref_key_quick_start"

            android:title="@string/tor_connect_automatically_label"

            app:iconSpaceReserved="false" />

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
        android:key="@string/pref_key_tor_network_settings_bridge_config_explanation"

        android:summary="@string/preferences_tor_network_settings_bridge_config_explanation"

        app:allowDividerBelow="false" />

    <SwitchPreference

    <SwitchPreferenceCompat

        android:defaultValue="false"

        android:key="@string/pref_key_tor_network_settings_bridge_config_toggle"

        android:title="@string/preferences_tor_network_settings_bridge_config_toggle"