From 8cbdce58e64bea7aabd407631f8614586ee7110d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hakk=C4=B1=20Kaan=20=C3=87al=C4=B1=C5=9Fkan?= Date: Tue, 16 Jun 2020 21:21:45 +0300 Subject: [PATCH] Update FxaServer.kt --- app/src/main/java/org/mozilla/fenix/components/FxaServer.kt | 5 ++--- app/src/main/java/org/mozilla/fenix/components/Services.kt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/FxaServer.kt b/app/src/main/java/org/mozilla/fenix/components/FxaServer.kt index de328936d..c863f748e 100644 --- a/app/src/main/java/org/mozilla/fenix/components/FxaServer.kt +++ b/app/src/main/java/org/mozilla/fenix/components/FxaServer.kt @@ -14,15 +14,14 @@ import org.mozilla.fenix.ext.settings object FxaServer { private const val CLIENT_ID = "a2270f727f45f648" - const val REDIRECT_URL = "urn:ietf:wg:oauth:2.0:oob:oauth-redirect-webchannel" fun config(context: Context): ServerConfig { val serverOverride = context.settings().overrideFxAServer val tokenServerOverride = context.settings().overrideSyncTokenServer.ifEmpty { null } if (serverOverride.isEmpty()) { - return ServerConfig(Server.RELEASE, CLIENT_ID, redirectUrl(), tokenServerOverride) + return ServerConfig(Server.RELEASE, CLIENT_ID, REDIRECT_URL, tokenServerOverride) } - return ServerConfig(serverOverride, CLIENT_ID, redirectUrl(), tokenServerOverride) + return ServerConfig(serverOverride, CLIENT_ID, REDIRECT_URL, tokenServerOverride) } } diff --git a/app/src/main/java/org/mozilla/fenix/components/Services.kt b/app/src/main/java/org/mozilla/fenix/components/Services.kt index 47d9338af..cdd549f86 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Services.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Services.kt @@ -26,7 +26,7 @@ class Services( private val accountManager: FxaAccountManager ) { val accountsAuthFeature by lazy { - FirefoxAccountsAuthFeature(accountManager, FxaServer.redirectUrl()) { context, authUrl -> + FirefoxAccountsAuthFeature(accountManager, FxaServer.REDIRECT_URL) { context, authUrl -> CoroutineScope(Dispatchers.Main).launch { val intent = SupportUtils.createAuthCustomTabIntent(context, authUrl) context.startActivity(intent)