Use ResourceObserver in CredentialSaveActivity

Signed-off-by: Alex Saveau <[email protected]>

Author: SUPERCILEX

auth/src/main/java/com/firebase/ui/auth/ui/credentials/CredentialSaveActivity.java

@@ -1,6 +1,5 @@
 package com.firebase.ui.auth.ui.credentials;
 
-import android.arch.lifecycle.Observer;
 import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
@@ -10,11 +9,12 @@
 import android.util.Log;
 
 import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.util.ExtraConstants;
-import com.firebase.ui.auth.util.ui.FlowUtils;
+import com.firebase.ui.auth.viewmodel.VoidResourceObserver;
 import com.firebase.ui.auth.viewmodel.smartlock.SmartLockHandler;
 import com.google.android.gms.auth.api.credentials.Credential;
 
@@ -47,15 +47,18 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         Credential credential = getIntent().getParcelableExtra(ExtraConstants.CREDENTIAL);
         mIdpResponse = getIntent().getParcelableExtra(ExtraConstants.IDP_RESPONSE);
 
-        mHandler.getOperation().observe(this, new Observer<Resource<Void>>() {
+        mHandler.getOperation().observe(this, new VoidResourceObserver(
+                this, R.string.fui_progress_dialog_loading) {
             @Override
-            public void onChanged(@Nullable Resource<Void> resource) {
-                if (resource == null) {
-                    Log.w(TAG, "getSaveOperation:onChanged:null");
-                    return;
-                }
+            protected void onSuccess() {
+                finish(RESULT_OK, mIdpResponse.toIntent());
+            }
 
-                if (!resource.isUsed()) { onSaveOperation(resource); }
+            @Override
+            protected void onFailure(@NonNull Exception e) {
+                // RESULT_OK since we don't want to halt sign-in just because of a credential save
+                // error.
+                finish(RESULT_OK, mIdpResponse.toIntent());
             }
         });
 
@@ -74,18 +77,4 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         mHandler.onActivityResult(requestCode, resultCode);
     }
-
-    private void onSaveOperation(@NonNull Resource<Void> resource) {
-        switch (resource.getState()) {
-            case LOADING:
-                // No-op?
-                break;
-            case SUCCESS:
-            case FAILURE:
-                if (FlowUtils.unhandled(this, resource.getException())) {
-                    finish(RESULT_OK, mIdpResponse.toIntent());
-                }
-                break;
-        }
-    }
 }

auth/src/main/java/com/firebase/ui/auth/viewmodel/VoidResourceObserver.java

@@ -0,0 +1,21 @@
+package com.firebase.ui.auth.viewmodel;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.RestrictTo;
+import android.support.annotation.StringRes;
+
+import com.firebase.ui.auth.ui.HelperActivityBase;
+
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public abstract class VoidResourceObserver extends ResourceObserver<Void> {
+    protected VoidResourceObserver(@NonNull HelperActivityBase activity, @StringRes int message) {
+        super(activity, message);
+    }
+
+    @Override
+    protected final void onSuccess(@NonNull Void aVoid) {
+        onSuccess();
+    }
+
+    protected abstract void onSuccess();
+}