clairehurst pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser

Commits:

1 changed file:

Changes:

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
    ... ... @@ -12,6 +12,7 @@ import android.os.Build
    12 12
     import android.os.Bundle
    
    13 13
     import android.os.Handler
    
    14 14
     import android.os.Looper
    
    15
    +import android.os.StrictMode
    
    15 16
     import android.util.Log
    
    16 17
     import android.view.LayoutInflater
    
    17 18
     import android.view.View
    
    ... ... @@ -37,7 +38,6 @@ import kotlinx.coroutines.CoroutineScope
    37 38
     import kotlinx.coroutines.Dispatchers
    
    38 39
     import kotlinx.coroutines.delay
    
    39 40
     import kotlinx.coroutines.launch
    
    40
    -import kotlinx.coroutines.runBlocking
    
    41 41
     import mozilla.components.browser.state.state.selectedOrDefaultSearchEngine
    
    42 42
     import mozilla.components.concept.engine.Engine
    
    43 43
     import mozilla.components.concept.sync.AccountObserver
    
    ... ... @@ -191,7 +191,7 @@ class SettingsFragment : PreferenceFragmentCompat(), UserInteractionHandler {
    191 191
         }
    
    192 192
     
    
    193 193
         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
    
    194
    -        runBlocking(context = Dispatchers.IO) {
    
    194
    +        requireContext().components.strictMode.resetAfter(StrictMode.allowThreadDiskReads()) {
    
    195 195
                 setPreferencesFromResource(R.xml.preferences, rootKey)
    
    196 196
             }
    
    197 197
         }