From 78c3db1fc8b15dcbeb65e7ae15ef05f0fecc372f Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Wed, 13 Mar 2019 09:23:55 -0700
Subject: [PATCH] Fixes #992: Updates account implementation for a-c 47.0
 (#995)

---
 .../mozilla/fenix/components/BackgroundServices.kt    |  2 +-
 .../mozilla/fenix/components/toolbar/ToolbarUIView.kt |  3 +++
 .../mozilla/fenix/settings/AccountSettingsFragment.kt |  2 +-
 .../org/mozilla/fenix/settings/SettingsFragment.kt    | 11 +++++------
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
index afc1fcdb7..6858d811a 100644
--- a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
@@ -28,5 +28,5 @@ class BackgroundServices(
     private val scopes: Array<String> = arrayOf("profile", "https://identity.mozilla.com/apps/oldsync")
     private val config = Config.release(CLIENT_ID, REDIRECT_URL)
 
-    val accountManager = FxaAccountManager(context, config, scopes).also { it.init() }
+    val accountManager = FxaAccountManager(context, config, scopes).also { it.initAsync() }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt
index 2420a9caa..9848ca733 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt
@@ -54,6 +54,9 @@ class ToolbarUIView(
             hintColor = ContextCompat.getColor(context, R.color.search_text)
 
             setOnEditListener(object : mozilla.components.concept.toolbar.Toolbar.OnEditListener {
+                override fun onCancelEditing(): Boolean {
+                    return true
+                }
                 override fun onTextChanged(text: String) {
                     url = text
                     actionEmitter.onNext(SearchAction.TextChanged(text))
diff --git a/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt
index 31cb4b74d..e953199fa 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt
@@ -46,7 +46,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat(), CoroutineScope {
     private fun getClickListenerForSignOut(): Preference.OnPreferenceClickListener {
         return Preference.OnPreferenceClickListener {
             launch {
-                requireComponents.backgroundServices.accountManager.logout().await()
+                requireComponents.backgroundServices.accountManager.logoutAsync().await()
                 Navigation.findNavController(view!!).popBackStack()
             }
             true
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 793ed4353..2d65b88de 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -21,12 +21,12 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import mozilla.components.concept.sync.AccountObserver
+import mozilla.components.concept.sync.OAuthAccount
+import mozilla.components.concept.sync.Profile
 import kotlin.coroutines.CoroutineContext
 import java.io.File
-import mozilla.components.service.fxa.AccountObserver
-import mozilla.components.service.fxa.FirefoxAccountShaped
 import mozilla.components.service.fxa.FxaUnauthorizedException
-import mozilla.components.service.fxa.Profile
 import mozilla.components.support.ktx.android.graphics.toDataUri
 import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.FenixApplication
@@ -246,8 +246,7 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope, AccountObse
         Navigation.findNavController(view!!).navigate(directions)
     }
 
-    // --- AccountObserver interfaces ---
-    override fun onAuthenticated(account: FirefoxAccountShaped) {
+    override fun onAuthenticated(account: OAuthAccount) {
         updateAuthState(account)
     }
 
@@ -267,7 +266,7 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope, AccountObse
     }
 
     // --- Account UI helpers ---
-    private fun updateAuthState(account: FirefoxAccountShaped? = null) {
+    private fun updateAuthState(account: OAuthAccount? = null) {
         val preferenceSignIn = findPreference<Preference>(context?.getPreferenceKey(pref_key_sign_in))
         val preferenceFirefoxAccount = findPreference<Preference>(context?.getPreferenceKey(pref_key_account))
         val accountPreferenceCategory =