From 3f9ed2992c0a414c7f3355944fca8e48cd7e2db6 Mon Sep 17 00:00:00 2001
From: Grisha Kruglov <gkruglov@mozilla.com>
Date: Wed, 5 Feb 2020 16:00:43 +0100
Subject: [PATCH] Bump to a-s 0.50.0

---
 .../OnboardingAutomaticSignInViewHolder.kt    | 26 +++++++++++--------
 buildSrc/src/main/java/Dependencies.kt        |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolder.kt
index 8a2b91d4c..e22d10edb 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolder.kt
@@ -12,6 +12,7 @@ import kotlinx.android.synthetic.main.onboarding_automatic_signin.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import mozilla.components.service.fxa.manager.SignInWithShareableAccountResult
 import mozilla.components.service.fxa.sharing.ShareableAccount
 import mozilla.components.support.ktx.android.view.putCompoundDrawablesRelativeWithIntrinsicBounds
 import org.mozilla.fenix.R
@@ -31,17 +32,20 @@ class OnboardingAutomaticSignInViewHolder(private val view: View) : RecyclerView
             CoroutineScope(Dispatchers.Main).launch {
                 val result = view.context.components.backgroundServices.accountManager
                     .signInWithShareableAccountAsync(shareableAccount).await()
-                if (result) {
-                    // Success.
-                } else {
-                    // Failed to sign-in (either network problem, or bad credentials). Allow to try again.
-                    it.turn_on_sync_button.text = it.context.getString(
-                        R.string.onboarding_firefox_account_auto_signin_confirm
-                    )
-                    it.turn_on_sync_button.isEnabled = true
-                    FenixSnackbar.make(it, Snackbar.LENGTH_SHORT).setText(
-                        it.context.getString(R.string.onboarding_firefox_account_automatic_signin_failed)
-                    ).show()
+                when (result) {
+                    SignInWithShareableAccountResult.Failure -> {
+                        // Failed to sign-in (e.g. bad credentials). Allow to try again.
+                        it.turn_on_sync_button.text = it.context.getString(
+                            R.string.onboarding_firefox_account_auto_signin_confirm
+                        )
+                        it.turn_on_sync_button.isEnabled = true
+                        FenixSnackbar.make(it, Snackbar.LENGTH_SHORT).setText(
+                            it.context.getString(R.string.onboarding_firefox_account_automatic_signin_failed)
+                        ).show()
+                    }
+                    SignInWithShareableAccountResult.WillRetry, SignInWithShareableAccountResult.Success -> {
+                        // We consider both of these as a 'success'.
+                    }
                 }
             }
         }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index e9762fc8b..62577602e 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -39,7 +39,7 @@ object Versions {
     // that we depend on directly for the fenix-megazord (and for it's
     // forUnitTest variant), and it's important that it be kept in
     // sync with the version used by android-components above.
-    const val mozilla_appservices = "0.48.3"
+    const val mozilla_appservices = "0.50.0"
 
     const val mozilla_glean = "23.0.0"