Differentiate between user cancellation and actual errors

app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

@@ -34,7 +34,7 @@
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.IdpResponse;
-import com.firebase.ui.auth.ui.ResultCodes;
+import com.firebase.ui.auth.ResultCodes;
 import com.firebase.uidemo.R;
 import com.google.android.gms.common.Scopes;
 import com.google.firebase.auth.FirebaseAuth;
@@ -199,22 +199,27 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
     @MainThread
     private void handleSignInResponse(int resultCode, Intent data) {
-        if (resultCode == RESULT_OK) {
+        if (resultCode == ResultCodes.OK) {
             startActivity(SignedInActivity.createIntent(this, IdpResponse.fromResultIntent(data)));
             finish();
             return;
         }
 
-        if (resultCode == RESULT_CANCELED) {
+        if (resultCode == ResultCodes.CANCELED) {
             showSnackbar(R.string.sign_in_cancelled);
             return;
         }
 
-        if (resultCode == ResultCodes.RESULT_NO_NETWORK) {
+        if (resultCode == ResultCodes.NO_NETWORK) {
             showSnackbar(R.string.no_internet_connection);
             return;
         }
 
+        if (resultCode == ResultCodes.UNKNOWN_ERROR) {
+            showSnackbar(R.string.unknown_error);
+            return;
+        }
+
         showSnackbar(R.string.unknown_sign_in_response);
     }
 

app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java

@@ -28,9 +28,7 @@
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
+
 import com.bumptech.glide.Glide;
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.IdpResponse;
@@ -42,8 +40,13 @@
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthProvider;
+
 import java.util.Iterator;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
 public class SignedInActivity extends AppCompatActivity {
     private static final String EXTRA_IDP_RESPONSE = "extra_idp_response";
 
@@ -62,6 +65,8 @@ public class SignedInActivity extends AppCompatActivity {
     @BindView(R.id.user_enabled_providers)
     TextView mEnabledProviders;
 
+    private IdpResponse mIdpResponse;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -73,6 +78,8 @@ public void onCreate(Bundle savedInstanceState) {
             return;
         }
 
+        mIdpResponse = getIntent().getParcelableExtra(EXTRA_IDP_RESPONSE);
+
         setContentView(R.layout.signed_in_layout);
         ButterKnife.bind(this);
         populateProfile();
@@ -174,10 +181,9 @@ private void populateProfile() {
     }
 
     private void populateIdpToken() {
-        IdpResponse idpResponse = getIntent().getParcelableExtra(EXTRA_IDP_RESPONSE);
-        if (idpResponse != null) {
-            String token = idpResponse.getIdpToken();
-            String secret = idpResponse.getIdpSecret();
+        if (mIdpResponse != null) {
+            String token = mIdpResponse.getIdpToken();
+            String secret = mIdpResponse.getIdpSecret();
             if (token == null) {
                 findViewById(R.id.idp_token_layout).setVisibility(View.GONE);
             } else {

app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java

@@ -14,6 +14,7 @@
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
+import com.firebase.ui.auth.ResultCodes;
 import com.firebase.ui.storage.images.FirebaseImageLoader;
 import com.firebase.uidemo.R;
 import com.google.android.gms.tasks.OnCompleteListener;
@@ -82,7 +83,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
         if (requestCode == RC_CHOOSE_PHOTO) {
-            if (resultCode == RESULT_OK) {
+            if (resultCode == ResultCodes.OK) {
                 Uri selectedImage = data.getData();
                 uploadPhoto(selectedImage);
             } else {

app/src/main/res/values/strings.xml

@@ -57,4 +57,5 @@
     <string name="photos">Photos</string>
     <string name="idp_token">IDP Token</string>
     <string name="idp_secret">IDP Secret</string>
+    <string name="unknown_error">An unknown error occurred</string>
 </resources>

auth/README.md

@@ -204,8 +204,8 @@ startActivityForResult(
 
 #####Response codes
 The authentication flow only provides three response codes:
-`Activity.RESULT_OK` if a user is signed in, `Activity.RESULT_CANCELLED` if
-sign in failed, and `ResultCodes.RESULT_NO_NETWORK` if sign in failed due to a lack of network connectivity.
+`ResultCodes.OK` if a user is signed in, `ResultCodes.CANCELLED` if
+sign in failed, and `ResultCodes.NO_NETWORK` if sign in failed due to a lack of network connectivity.
 No further information on failure is provided as it is not
 typically useful; the only recourse for most apps if sign in fails is to ask
 the user to sign in again later, or proceed with anonymous sign-in if
@@ -214,24 +214,30 @@ supported.
 ```java
 protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     super.onActivityResult(requestCode, resultCode, data);
-    if (resultCode == RESULT_OK) {
+    if (resultCode == ResultCodes.OK) {
         // user is signed in!
         startActivity(new Intent(this, WelcomeBackActivity.class));
         finish();
         return;
     }
 
     // Sign in canceled
-    if (resultCode == RESULT_CANCELED) {
+    if (resultCode == ResultCodes.CANCELED) {
         showSnackbar(R.string.sign_in_cancelled);
         return;
     }
 
     // No network
-    if (resultCode == ResultCodes.RESULT_NO_NETWORK) {
+    if (resultCode == ResultCodes.NO_NETWORK) {
         showSnackbar(R.string.no_internet_connection);
         return;
     }
+
+
+    if (resultCode == ResultCodes.UNKNOWN_ERROR) {
+        showSnackbar(R.string.unknown_error);
+        return;
+    }
 
     // User is not signed in. Maybe just wait for the user to press
     // "sign in" again, or show a message.
@@ -250,7 +256,7 @@ Intent.
 ```java
 protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     super.onActivityResult(requestCode, resultCode, data);
-    if (resultCode == RESULT_OK) {
+    if (resultCode == ResultCodes.OK) {
         IdpResponse idpResponse = IdpResponse.fromResultIntent(data);
         startActivity(new Intent(this, WelcomeBackActivity.class)
                 .putExtra("my_token", idpResponse.getIdpToken()));

auth/src/main/java/com/firebase/ui/auth/AuthUI.java

@@ -137,8 +137,9 @@
  *
  * <h3>Handling the Sign-in response</h3>
  *
- * The authentication flow provides only two response codes: {@link Activity#RESULT_OK RESULT_OK}
- * if a user is signed in, and {@link Activity#RESULT_CANCELED RESULT_CANCELLED} if sign in
+ * The authentication flow provides only two response codes:
+ * {@link ResultCodes#OK RESULT_OK} if a user is signed in,
+ * and {@link ResultCodes#CANCELED RESULT_CANCELLED} if sign in
  * failed. No further information on failure is provided as it is not typically useful; the only
  * recourse for most apps if sign in fails is to ask the user to sign in again later, or proceed
  * with an anonymous account if supported.
@@ -149,7 +150,7 @@
  * protected void onActivityResult(int requestCode, int resultCode, Intent data) {
  *   super.onActivityResult(requestCode, resultCode, data);
  *   if (requestCode == RC_SIGN_IN) {
- *     if (resultCode == RESULT_OK) {
+ *     if (resultCode == ResultCodes.OK) {
  *       // user is signed in!
  *       startActivity(new Intent(this, WelcomeBackActivity.class));
  *       finish();

auth/src/main/java/com/firebase/ui/auth/IdpResponse.java

@@ -31,12 +31,11 @@ public class IdpResponse implements Parcelable {
     private final String mToken;
     private final String mSecret;
 
-    public IdpResponse(String providerId, @Nullable String email) {
+    public IdpResponse(String providerId, String email) {
         this(providerId, email, null, null);
     }
 
-    public IdpResponse(
-            String providerId, @Nullable String email, @Nullable String token) {
+    public IdpResponse(String providerId, @Nullable String email, @Nullable String token) {
         this(providerId, email, token, null);
     }
 

auth/src/main/java/com/firebase/ui/auth/ResultCodes.java

@@ -0,0 +1,33 @@
+package com.firebase.ui.auth;
+
+import android.app.Activity;
+
+/**
+ * Result codes returned when using {@link AuthUI.SignInIntentBuilder#build()} with
+ * {@code startActivityForResult}.
+ */
+public final class ResultCodes {
+    private ResultCodes() {
+        // We don't want people to initialize this class
+    }
+
+    /**
+     * Sign in succeeded
+     **/
+    public static final int OK = Activity.RESULT_OK;
+
+    /**
+     * Sign in canceled by user
+     **/
+    public static final int CANCELED = Activity.RESULT_CANCELED;
+
+    /**
+     * Sign in failed due to lack of network connection
+     **/
+    public static final int NO_NETWORK = 10;
+
+    /**
+     * An unknown error has occurred
+     **/
+    public static final int UNKNOWN_ERROR = 20;
+}

auth/src/main/java/com/firebase/ui/auth/ui/ActivityHelper.java

@@ -18,6 +18,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.firebase.auth.FirebaseUser;
 
@@ -44,7 +45,8 @@ public SaveSmartLock getSaveSmartLockInstance() {
     public void saveCredentialsOrFinish(
             @Nullable SaveSmartLock saveSmartLock,
             FirebaseUser firebaseUser,
-            @NonNull String password) {
-        saveCredentialsOrFinish(saveSmartLock, mActivity, firebaseUser, password, null);
+            @NonNull String password,
+            IdpResponse response) {
+        saveCredentialsOrFinish(saveSmartLock, mActivity, firebaseUser, password, response);
     }
 }

auth/src/main/java/com/firebase/ui/auth/ui/BaseHelper.java

@@ -10,14 +10,14 @@
 import android.support.v4.app.FragmentActivity;
 
 import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.ResultCodes;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.auth.api.Auth;
 import com.google.android.gms.auth.api.credentials.CredentialsApi;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 
-import static android.app.Activity.RESULT_OK;
 import static com.firebase.ui.auth.util.Preconditions.checkNotNull;
 
 public class BaseHelper {
@@ -115,9 +115,9 @@ public void saveCredentialsOrFinish(
             Activity activity,
             FirebaseUser firebaseUser,
             @Nullable String password,
-            @Nullable IdpResponse response) {
+            IdpResponse response) {
         if (saveSmartLock == null) {
-            finishActivity(activity, RESULT_OK, new Intent());
+            finishActivity(activity, ResultCodes.OK, new Intent());
         } else {
             saveSmartLock.saveCredentialsOrFinish(
                     firebaseUser,

auth/src/main/java/com/firebase/ui/auth/ui/ResultCodes.java

@@ -6,9 +6,15 @@
  * Result codes returned when using {@link AuthUI.SignInIntentBuilder#build()} with
  * {@code startActivityForResult}.
  */
+@Deprecated
 public class ResultCodes {
 
-    /** Sign in failed due to lack of network connection **/
-    public static final int RESULT_NO_NETWORK = 10;
+    /**
+     * Sign in failed due to lack of network connection
+     *
+     * @deprecated Please use {@link com.firebase.ui.auth.ResultCodes#NO_NETWORK}
+     **/
+    @Deprecated
+    public static final int RESULT_NO_NETWORK = com.firebase.ui.auth.ResultCodes.NO_NETWORK;
 
 }

auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIdpPrompt.java

@@ -14,7 +14,6 @@
 
 package com.firebase.ui.auth.ui.account_link;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -28,6 +27,7 @@
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
+import com.firebase.ui.auth.ResultCodes;
 import com.firebase.ui.auth.provider.AuthCredentialHelper;
 import com.firebase.ui.auth.provider.FacebookProvider;
 import com.firebase.ui.auth.provider.GoogleProvider;
@@ -80,7 +80,7 @@ protected void onCreate(Bundle savedInstanceState) {
                         break;
                     default:
                         Log.w(TAG, "Unknown provider: " + providerId);
-                        finish(RESULT_CANCELED, getIntent());
+                        finish(ResultCodes.UNKNOWN_ERROR, getIntent());
                         return;
                 }
             }
@@ -94,7 +94,7 @@ protected void onCreate(Bundle savedInstanceState) {
             getIntent().putExtra(
                     ExtraConstants.EXTRA_ERROR_MESSAGE,
                     "Firebase login successful. Account linking failed due to provider not enabled by application");
-            finish(RESULT_CANCELED, getIntent());
+            finish(ResultCodes.UNKNOWN_ERROR, getIntent());
             return;
         }
 
@@ -135,7 +135,7 @@ public void onSuccess(IdpResponse idpResponse) {
     @Override
     public void onFailure(Bundle extra) {
         Toast.makeText(getApplicationContext(), "Error signing in", Toast.LENGTH_LONG).show();
-        finish(RESULT_CANCELED, new Intent());
+        finish(ResultCodes.UNKNOWN_ERROR, new Intent());
     }
 
     private String getProviderIdFromIntent() {
@@ -154,7 +154,7 @@ private void next(final IdpResponse newIdpResponse) {
         AuthCredential newCredential = AuthCredentialHelper.getAuthCredential(newIdpResponse);
         if (newCredential == null) {
             Log.e(TAG, "No credential returned");
-            finish(Activity.RESULT_FIRST_USER, new Intent());
+            finish(ResultCodes.UNKNOWN_ERROR, new Intent());
             return;
         }
 
@@ -176,7 +176,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                                         TAG, "Error signing in with previous credential"))
                                 .addOnCompleteListener(new FinishListener(newIdpResponse));
                     } else {
-                        finish(Activity.RESULT_OK, new Intent().putExtra(
+                        finish(ResultCodes.OK, new Intent().putExtra(
                                 ExtraConstants.EXTRA_IDP_RESPONSE, newIdpResponse));
                     }
                 }
@@ -211,7 +211,7 @@ private class FinishListener implements OnCompleteListener<AuthResult> {
         }
 
         public void onComplete(@NonNull Task task) {
-            finish(Activity.RESULT_OK,
+            finish(ResultCodes.OK,
                    new Intent().putExtra(ExtraConstants.EXTRA_IDP_RESPONSE, mIdpResponse));
         }
     }