[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI



Title: GitLab

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

Commits:

  • 2bc609e5
    by hackademix at 2024-03-12T10:34:19+01:00
    fixup! Add Tor integration and UI
    
    Bug 42440: Remove the "Prioritize .onion sites when known" option
    

8 changed files:

Changes:

  • android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
    ... ... @@ -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
         }
    

  • android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt
    ... ... @@ -213,8 +213,6 @@ abstract class Settings {
    213 213
     
    
    214 214
         open var spoofEnglish: Boolean by UnsupportedSetting()
    
    215 215
     
    
    216
    -    open var prioritizeOnions: Boolean by UnsupportedSetting()
    
    217
    -
    
    218 216
         open var useNewBootstrap: Boolean by UnsupportedSetting()
    
    219 217
     }
    
    220 218
     
    
    ... ... @@ -260,7 +258,6 @@ data class DefaultSettings(
    260 258
         override var cookieBannerHandlingDetectOnlyMode: Boolean = false,
    
    261 259
         override var torSecurityLevel: Int = 4,
    
    262 260
         override var spoofEnglish: Boolean = false,
    
    263
    -    override var prioritizeOnions: Boolean = false,
    
    264 261
         override var useNewBootstrap: Boolean = false,
    
    265 262
     ) : Settings()
    
    266 263
     
    

  • fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
    ... ... @@ -145,7 +145,6 @@ class Core(
    145 145
                     .shouldShowCookieBannerReEngagementDialog(),
    
    146 146
                 torSecurityLevel = context.settings().torSecurityLevel().intRepresentation,
    
    147 147
                 spoofEnglish = context.settings().spoofEnglish,
    
    148
    -            prioritizeOnions = context.settings().prioritizeOnions,
    
    149 148
                 useNewBootstrap = context.settings().useNewBootstrap,
    
    150 149
             )
    
    151 150
     
    

  • fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
    ... ... @@ -462,10 +462,8 @@ class SettingsFragment : PreferenceFragmentCompat() {
    462 462
         }
    
    463 463
     
    
    464 464
         private fun setupPreferences() {
    
    465
    -        val prioritizeOnionsKey = getPreferenceKey(R.string.pref_key_tor_prioritize_onions)
    
    466 465
             val leakKey = getPreferenceKey(R.string.pref_key_leakcanary)
    
    467 466
             val debuggingKey = getPreferenceKey(R.string.pref_key_remote_debugging)
    
    468
    -        val preferencePrioritizeOnions = findPreference<Preference>(prioritizeOnionsKey)
    
    469 467
             val preferenceLeakCanary = findPreference<Preference>(leakKey)
    
    470 468
             val preferenceRemoteDebugging = findPreference<Preference>(debuggingKey)
    
    471 469
             val preferenceMakeDefaultBrowser =
    
    ... ... @@ -484,13 +482,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
    484 482
                 }
    
    485 483
             }
    
    486 484
     
    
    487
    -        preferencePrioritizeOnions?.setOnPreferenceChangeListener<Boolean> { preference, newValue ->
    
    488
    -            preference.context.settings().preferences.edit()
    
    489
    -                .putBoolean(preference.key, newValue).apply()
    
    490
    -            requireComponents.core.engine.settings.prioritizeOnions = newValue
    
    491
    -            true
    
    492
    -        }
    
    493
    -
    
    494 485
             if (!Config.channel.isReleased) {
    
    495 486
                 preferenceLeakCanary?.setOnPreferenceChangeListener { _, newValue ->
    
    496 487
                     val isEnabled = newValue == true
    

  • fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
    ... ... @@ -335,11 +335,6 @@ class Settings(private val appContext: Context) : PreferencesHolder {
    335 335
             default = false
    
    336 336
         )
    
    337 337
     
    
    338
    -    var prioritizeOnions by booleanPreference(
    
    339
    -        appContext.getPreferenceKey(R.string.pref_key_tor_prioritize_onions),
    
    340
    -        default = false
    
    341
    -    )
    
    342
    -
    
    343 338
         var defaultSearchEngineName by stringPreference(
    
    344 339
             appContext.getPreferenceKey(R.string.pref_key_search_engine),
    
    345 340
             default = "",
    

  • fenix/app/src/main/res/values/preference_keys.xml
    ... ... @@ -393,6 +393,4 @@
    393 393
         <string name="pref_key_tor_network_settings_bridges_enabled">pref_key_tor_network_settings_bridges_enabled</string>
    
    394 394
     
    
    395 395
         <string name="pref_key_spoof_english" translatable="false">pref_key_spoof_english</string>
    
    396
    -
    
    397
    -    <string name="pref_key_tor_prioritize_onions" translatable="false">pref_key_tor_prioritize_onions</string>
    
    398 396
     </resources>

  • fenix/app/src/main/res/values/torbrowser_strings.xml
    ... ... @@ -72,8 +72,6 @@
    72 72
     
    
    73 73
         <!-- Spoof locale to English -->
    
    74 74
         <string name="tor_spoof_english">Request English versions of web pages for enhanced privacy</string>
    
    75
    -    <!-- Onion location -->
    
    76
    -    <string name="preferences_tor_prioritize_onions">Prioritize .onion sites</string>
    
    77 75
     
    
    78 76
         <!-- Connection assist. -->
    
    79 77
         <string name="connection_assist_tor_connect_title">Connect to Tor</string>
    

  • fenix/app/src/main/res/xml/preferences.xml
    ... ... @@ -122,11 +122,6 @@
    122 122
                 app:iconSpaceReserved="false"
    
    123 123
                 android:title="@string/preferences_tor_network_settings" />
    
    124 124
     
    
    125
    -        <SwitchPreference
    
    126
    -            android:key="@string/pref_key_tor_prioritize_onions"
    
    127
    -            app:iconSpaceReserved="false"
    
    128
    -            android:title="@string/preferences_tor_prioritize_onions" />
    
    129
    -
    
    130 125
             <androidx.preference.Preference
    
    131 126
                 android:key="@string/pref_key_tracking_protection_settings"
    
    132 127
                 app:iconSpaceReserved="false"
    

  • _______________________________________________
    tor-commits mailing list
    tor-commits@xxxxxxxxxxxxxxxxxxxx
    https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits