blallo
/
fenix
1
0
Fork 0
Code Releases Activity

No issue: Move PublicSuffixList to root component 

With the PublicSuffixList class in Utilities, the first instantiation
of it (prefetching in onCreate), causes the Utilities to instantiate
and thus slowing down startup by needing the SearchEngineManager from
instantiating as well.

Moving this back to the root component fixes the immediate perf issue.

Co-authored-by: Will Hawkins <whh8b@obs.cr>
master
Jonathan Almeida 2019-07-31 19:20:34 -04:00 committed by Jeff Boek
parent 59c0005979
commit 4922e5d09d
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/HomeActivity.kt
View File

@ -75,7 +75,7 @@ open class HomeActivity : AppCompatActivity(), ShareFragment.TabsSharedCallback
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
components.utils.publicSuffixList.prefetch()
components.publicSuffixList.prefetch()
setupThemeAndBrowsingMode()
setContentView(R.layout.activity_home)

2
app/src/main/java/org/mozilla/fenix/components/Components.kt
View File

@ -5,6 +5,7 @@
package org.mozilla.fenix.components
import android.content.Context
import mozilla.components.lib.publicsuffixlist.PublicSuffixList
import org.mozilla.fenix.test.Mockable
/**
@ -21,4 +22,5 @@ class Components(private val context: Context) {
val useCases by lazy { UseCases(context, core.sessionManager, core.engine.settings, search.searchEngineManager) }
val utils by lazy { Utilities(context, core.sessionManager, useCases.sessionUseCases, useCases.searchUseCases) }
val analytics by lazy { Analytics(context) }
val publicSuffixList by lazy { PublicSuffixList(context) }
}

3
app/src/main/java/org/mozilla/fenix/components/Utilities.kt
View File

@ -10,7 +10,6 @@ import mozilla.components.feature.customtabs.CustomTabIntentProcessor
import mozilla.components.feature.intent.TabIntentProcessor
import mozilla.components.feature.search.SearchUseCases
import mozilla.components.feature.session.SessionUseCases
import mozilla.components.lib.publicsuffixlist.PublicSuffixList
import org.mozilla.fenix.test.Mockable
/**
@ -38,6 +37,4 @@ class Utilities(
val customTabIntentProcessor by lazy {
CustomTabIntentProcessor(sessionManager, sessionUseCases.loadUrl, context.resources)
}
val publicSuffixList by lazy { PublicSuffixList(context) }
}

2
app/src/main/java/org/mozilla/fenix/ext/String.kt
View File

@ -37,7 +37,7 @@ fun String.urlToTrimmedHost(context: Context): String {
return try {
val host = toUri().hostWithoutCommonPrefixes ?: return this
runBlocking {
context.components.utils.publicSuffixList.stripPublicSuffix(host).await()
context.components.publicSuffixList.stripPublicSuffix(host).await()
}
} catch (e: MalformedURLException) {
this