Change WelcombackIDPPrompt to use IDPParcels propagated through

the activities
Bug:28654311

Change-Id: Ia19134945896257043489c73721a880df1a9a960

Author: Jiachen Zhao

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

@@ -24,7 +24,9 @@
 import com.firebase.ui.auth.choreographer.Controller;
 import com.firebase.ui.auth.choreographer.ControllerConstants;
 import com.firebase.ui.auth.choreographer.Result;
+import com.firebase.ui.auth.choreographer.idp.provider.IDPProviderParcel;
 
+import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public abstract class BaseActivity extends android.support.v7.app.AppCompatActivity {
@@ -40,6 +42,7 @@ public abstract class BaseActivity extends android.support.v7.app.AppCompatActiv
     protected String mAppName;
     protected String mTermsOfServiceUrl;
     protected AtomicBoolean isPendingFinishing = new AtomicBoolean(false);
+    protected ArrayList<IDPProviderParcel> mProviderParcels;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -48,6 +51,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mAppName = getIntent().getStringExtra(ControllerConstants.EXTRA_APP_NAME);
         mTermsOfServiceUrl = getIntent().getStringExtra(ControllerConstants.EXTRA_TERMS_OF_SERVICE_URL);
         mId = previousIntent.getIntExtra(EXTRA_ID, Controller.DEFAULT_INIT_FLOW_ID);
+        mProviderParcels = getIntent().getParcelableArrayListExtra(ControllerConstants.EXTRA_PROVIDERS);
         mController = setUpController();
     }
 
@@ -119,6 +123,10 @@ protected void doAction(Action action) {
                     ControllerConstants.EXTRA_TERMS_OF_SERVICE_URL,
                     mTermsOfServiceUrl
             );
+            newFlowIntent.putExtra(
+                    ControllerConstants.EXTRA_PROVIDERS,
+                    mProviderParcels
+            );
             this.startActivityForResult(newFlowIntent, NEXT_FLOW);
             return;
         }
@@ -130,6 +138,10 @@ protected void doAction(Action action) {
                             ControllerConstants.EXTRA_TERMS_OF_SERVICE_URL,
                             mTermsOfServiceUrl
                     )
+                    .putExtra(
+                            ControllerConstants.EXTRA_PROVIDERS,
+                            mProviderParcels
+                    )
                     .putExtra(EXTRA_ID, action.getNextId()));
         } else {
             this.setResult(action.getFinishResultCode(), action.getFinishData());

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

@@ -49,22 +49,28 @@ protected void onCreate(Bundle savedInstanceState) {
         mProviderId = getProviderIdFromIntent();
         setContentView(R.layout.welcome_back_idp_prompt_layout);
 
-        IDPProviderParcel parcel;
-        switch (mProviderId) {
-            case GoogleAuthProvider.PROVIDER_ID:
-                parcel = GoogleProvider.createParcel(
-                        JSONUtil.getGoogleClientId(getApplicationContext()));
-                mIDPProvider = new GoogleProvider(this, parcel);
-                break;
-            case FacebookAuthProvider.PROVIDER_ID:
-                parcel = FacebookProvider.createFacebookParcel(
-                        JSONUtil.getFacebookApplicationId(getApplicationContext()));
-                mIDPProvider = new FacebookProvider(this, parcel);
-                break;
-            default:
-                Log.w(TAG, "Unknown provider: " + mProviderId);
-                finish(RESULT_CANCELED, getIntent());
-                return;
+        mIDPProvider = null;
+        for (IDPProviderParcel providerParcel: mProviderParcels) {
+           if (mProviderId.equals(providerParcel.getProviderType())) {
+               switch (mProviderId) {
+                   case GoogleAuthProvider.PROVIDER_ID:
+                       mIDPProvider = new GoogleProvider(this, providerParcel);
+                       break;
+                   case FacebookAuthProvider.PROVIDER_ID:
+                       mIDPProvider = new FacebookProvider(this, providerParcel);
+                       break;
+                   default:
+                       Log.w(TAG, "Unknown provider: " + mProviderId);
+                       finish(RESULT_CANCELED, getIntent());
+                       return;
+               }
+           }
+        }
+
+        if (mIDPProvider == null) {
+            getIntent().putExtra(ControllerConstants.EXTRA_ERROR_MESSAGE,
+                    "Firebase login successful. Account linking failed due to provider not enabled by application");
+            finish(RESULT_CANCELED, getIntent());
         }
 
         ((TextView) findViewById(R.id.welcome_back_idp_prompt))

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

@@ -27,18 +27,10 @@
 
 public abstract class CredentialsBaseActivity extends BaseActivity {
     protected CredentialsAPI mCredentialsAPI;
-    private ArrayList<Parcelable> mParcelables;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mParcelables = getIntent().getParcelableArrayListExtra(ControllerConstants.EXTRA_PROVIDERS);
-    }
-
-    @Override
-    public void finish(int resultCode, Intent data) {
-        data.putParcelableArrayListExtra(ControllerConstants.EXTRA_PROVIDERS, mParcelables);
-        super.finish(resultCode, data);
     }
 
     @Override