Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use real search engine list always when faking the location provider #205

Merged
merged 2 commits into from Oct 4, 2020
Merged

Use real search engine list always when faking the location provider #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a834303
Only use fallback search engine list when location is evantually expe…
interfect Oct 4, 2020
b154857
Make the forkDebug build work again
interfect Oct 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/src/forkDebug/java/org/mozilla/fenix/DebugFenixApplication.kt
View file
Open in desktop
Expand Up @@ -9,12 +9,11 @@ import androidx.preference.PreferenceManager
import leakcanary.AppWatcher
import leakcanary.LeakCanary
import org.mozilla.fenix.ext.getPreferenceKey
import org.mozilla.fenix.ext.resetPoliciesAfter

class DebugFenixApplication : FenixApplication() {

override fun setupLeakCanary() {
val isEnabled = StrictMode.allowThreadDiskReads().resetPoliciesAfter {
val isEnabled = components.strictMode.resetAfter(StrictMode.allowThreadDiskReads()) {
PreferenceManager.getDefaultSharedPreferences(this)
.getBoolean(getPreferenceKey(R.string.pref_key_leakcanary), true)
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProvider.kt
View file
Open in desktop
Expand Up @@ -99,7 +99,7 @@ open class FenixSearchEngineProvider(
// the main one hasn't completed yet
private val searchEngines: Deferred<SearchEngineList>
get() =
if (isRegionCachedByLocationService) {
if (isRegionCachedByLocationService || shouldMockMLS) {
loadedSearchEngines
} else {
fallbackEngines
Expand Down