Fix GeckoProvider for beta and release variant.
This commit is contained in:
parent
686f7bd7c6
commit
1dca411515
|
@ -12,6 +12,7 @@ import mozilla.components.lib.crash.handler.CrashHandlerService
|
|||
import mozilla.components.service.sync.logins.GeckoLoginStorageDelegate
|
||||
import org.mozilla.fenix.Config
|
||||
import org.mozilla.fenix.ext.components
|
||||
import org.mozilla.geckoview.ContentBlocking
|
||||
import org.mozilla.geckoview.GeckoRuntime
|
||||
import org.mozilla.geckoview.GeckoRuntimeSettings
|
||||
import org.mozilla.geckoview.ContentBlocking.SafeBrowsingProvider
|
||||
|
|
|
@ -15,15 +15,10 @@ import org.mozilla.fenix.Config
|
|||
import org.mozilla.fenix.ext.components
|
||||
import org.mozilla.geckoview.GeckoRuntime
|
||||
import org.mozilla.geckoview.GeckoRuntimeSettings
|
||||
import org.mozilla.geckoview.ContentBlocking.SafeBrowsingProvider
|
||||
|
||||
object GeckoProvider {
|
||||
var testConfig: Bundle? = null
|
||||
private var runtime: GeckoRuntime? = null
|
||||
const val CN_UPDATE_URL =
|
||||
"https://sb.firefox.com.cn/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2"
|
||||
const val CN_GET_HASH_URL =
|
||||
"https://sb.firefox.com.cn/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2"
|
||||
|
||||
@Synchronized
|
||||
fun getOrCreateRuntime(
|
||||
|
@ -68,28 +63,6 @@ object GeckoProvider {
|
|||
runtimeSettings.fontSizeFactor = fontSize
|
||||
}
|
||||
|
||||
// Add safebrowsing providers for China
|
||||
if (Config.channel.isMozillaOnline) {
|
||||
val mozcn = SafeBrowsingProvider
|
||||
.withName("mozcn")
|
||||
.version("2.2")
|
||||
.lists("m6eb-phish-shavar", "m6ib-phish-shavar")
|
||||
.updateUrl(CN_UPDATE_URL)
|
||||
.getHashUrl(CN_GET_HASH_URL)
|
||||
.build()
|
||||
|
||||
runtimeSettings.contentBlocking.setSafeBrowsingProviders(mozcn,
|
||||
// Keep the existing configuration
|
||||
ContentBlocking.GOOGLE_SAFE_BROWSING_PROVIDER,
|
||||
ContentBlocking.GOOGLE_LEGACY_SAFE_BROWSING_PROVIDER)
|
||||
|
||||
runtimeSettings.contentBlocking.setSafeBrowsingPhishingTable(
|
||||
"m6eb-phish-shavar",
|
||||
"m6ib-phish-shavar",
|
||||
// Existing configuration
|
||||
"goog-phish-proto")
|
||||
}
|
||||
|
||||
val geckoRuntime = GeckoRuntime.create(context, runtimeSettings)
|
||||
val loginStorageDelegate = GeckoLoginStorageDelegate(storage)
|
||||
geckoRuntime.loginStorageDelegate = GeckoLoginDelegateWrapper(loginStorageDelegate)
|
||||
|
|
Loading…
Reference in New Issue
Block a user