GitLab

at 2024-03-12T10:34:19+01:00

fixup! Add Tor integration and UI

Bug 42440: Remove the "Prioritize .onion sites when known" option

                     localeUpdater.updateValue()

                 }

             }

-        override var prioritizeOnions: Boolean

-            get() = runtime.settings.prioritizeOnions

-            set(value) { runtime.settings.prioritizeOnions = value }

         override var useNewBootstrap: Boolean

             get() = runtime.settings.useNewBootstrap

             set(value) {

             this.cookieBannerHandlingDetectOnlyMode = it.cookieBannerHandlingDetectOnlyMode

             this.torSecurityLevel = it.torSecurityLevel

             this.spoofEnglish = it.spoofEnglish

-            this.prioritizeOnions = it.prioritizeOnions

             this.useNewBootstrap = it.useNewBootstrap

         }

     }

     open var spoofEnglish: Boolean by UnsupportedSetting()

-    open var prioritizeOnions: Boolean by UnsupportedSetting()

-

     open var useNewBootstrap: Boolean by UnsupportedSetting()

 }

     override var cookieBannerHandlingDetectOnlyMode: Boolean = false,

     override var torSecurityLevel: Int = 4,

     override var spoofEnglish: Boolean = false,

-    override var prioritizeOnions: Boolean = false,

     override var useNewBootstrap: Boolean = false,

 ) : Settings()

                 .shouldShowCookieBannerReEngagementDialog(),

             torSecurityLevel = context.settings().torSecurityLevel().intRepresentation,

             spoofEnglish = context.settings().spoofEnglish,

-            prioritizeOnions = context.settings().prioritizeOnions,

             useNewBootstrap = context.settings().useNewBootstrap,

         )

     }

     private fun setupPreferences() {

-        val prioritizeOnionsKey = getPreferenceKey(R.string.pref_key_tor_prioritize_onions)

         val leakKey = getPreferenceKey(R.string.pref_key_leakcanary)

         val debuggingKey = getPreferenceKey(R.string.pref_key_remote_debugging)

-        val preferencePrioritizeOnions = findPreference<Preference>(prioritizeOnionsKey)

         val preferenceLeakCanary = findPreference<Preference>(leakKey)

         val preferenceRemoteDebugging = findPreference<Preference>(debuggingKey)

         val preferenceMakeDefaultBrowser =

             }

         }

-        preferencePrioritizeOnions?.setOnPreferenceChangeListener<Boolean> { preference, newValue ->

-            preference.context.settings().preferences.edit()

-                .putBoolean(preference.key, newValue).apply()

-            requireComponents.core.engine.settings.prioritizeOnions = newValue

-            true

-        }

-

         if (!Config.channel.isReleased) {

             preferenceLeakCanary?.setOnPreferenceChangeListener { _, newValue ->

                 val isEnabled = newValue == true

         default = false

     )

-    var prioritizeOnions by booleanPreference(

-        appContext.getPreferenceKey(R.string.pref_key_tor_prioritize_onions),

-        default = false

-    )

-

     var defaultSearchEngineName by stringPreference(

         appContext.getPreferenceKey(R.string.pref_key_search_engine),

         default = "",

     <string name="pref_key_tor_network_settings_bridges_enabled">pref_key_tor_network_settings_bridges_enabled</string>

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

-

-    <string name="pref_key_tor_prioritize_onions" translatable="false">pref_key_tor_prioritize_onions</string>

 </resources>

     <!-- Spoof locale to English -->

     <string name="tor_spoof_english">Request English versions of web pages for enhanced privacy</string>

-    <!-- Onion location -->

-    <string name="preferences_tor_prioritize_onions">Prioritize .onion sites</string>

     <!-- Connection assist. -->

     <string name="connection_assist_tor_connect_title">Connect to Tor</string>

             app:iconSpaceReserved="false"

             android:title="@string/preferences_tor_network_settings" />

-        <SwitchPreference

-            android:key="@string/pref_key_tor_prioritize_onions"

-            app:iconSpaceReserved="false"

-            android:title="@string/preferences_tor_prioritize_onions" />

-

         <androidx.preference.Preference

             android:key="@string/pref_key_tracking_protection_settings"

             app:iconSpaceReserved="false"

...	...	@@ -796,9 +796,6 @@ class GeckoEngine(
796	796	localeUpdater.updateValue()
797	797	}
798	798	}
799		- override var prioritizeOnions: Boolean
800		- get() = runtime.settings.prioritizeOnions
801		- set(value) { runtime.settings.prioritizeOnions = value }
802	799	override var useNewBootstrap: Boolean
803	800	get() = runtime.settings.useNewBootstrap
804	801	set(value) {
...	...	@@ -828,7 +825,6 @@ class GeckoEngine(
828	825	this.cookieBannerHandlingDetectOnlyMode = it.cookieBannerHandlingDetectOnlyMode
829	826	this.torSecurityLevel = it.torSecurityLevel
830	827	this.spoofEnglish = it.spoofEnglish
831		- this.prioritizeOnions = it.prioritizeOnions
832	828	this.useNewBootstrap = it.useNewBootstrap
833	829	}
834	830	}

ma1 pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android

Commits:

8 changed files:

Changes: