[fenix] [https://github.com/mozilla-mobile/fenix/issues/4089] Moved PublicSuffixList to a sub-component(Utilities) class.

pull/600/head
chiragmantri 5 years ago committed by Jonathan Almeida
parent 4b72bc04e8
commit d675a8588d

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

@ -22,5 +22,4 @@ class Components(private val context: Context) {
val useCases by lazy { UseCases(context, core.sessionManager, core.engine.settings, search.searchEngineManager) } 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 utils by lazy { Utilities(context, core.sessionManager, useCases.sessionUseCases, useCases.searchUseCases) }
val analytics by lazy { Analytics(context) } val analytics by lazy { Analytics(context) }
val publicSuffixList by lazy { PublicSuffixList(context) }
} }

@ -10,6 +10,7 @@ import mozilla.components.feature.customtabs.CustomTabIntentProcessor
import mozilla.components.feature.intent.TabIntentProcessor import mozilla.components.feature.intent.TabIntentProcessor
import mozilla.components.feature.search.SearchUseCases import mozilla.components.feature.search.SearchUseCases
import mozilla.components.feature.session.SessionUseCases import mozilla.components.feature.session.SessionUseCases
import mozilla.components.lib.publicsuffixlist.PublicSuffixList
import org.mozilla.fenix.test.Mockable import org.mozilla.fenix.test.Mockable
/** /**
@ -44,4 +45,6 @@ class Utilities(
val notificationManager by lazy { val notificationManager by lazy {
NotificationManager(context) NotificationManager(context)
} }
val publicSuffixList by lazy { PublicSuffixList(context) }
} }

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

Loading…
Cancel
Save