Fix the taskbar showing on invisible activities.

Change-Id: Ib94320b887fabba1771ed36f62075c077a147ef4

Author: Aaron Mandle

auth/src/main/java/com/firebase/ui/auth/ui/email/AcquireEmailActivity.java renamed to auth/src/main/java/com/firebase/ui/auth/ui/AcquireEmailHelper.java

@@ -12,15 +12,16 @@
  * limitations under the License.
  */
 
-package com.firebase.ui.auth.ui.email;
+package com.firebase.ui.auth.ui;
 
 import android.content.Intent;
 import android.support.annotation.NonNull;
 
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.choreographer.ControllerConstants;
-import com.firebase.ui.auth.ui.NoControllerBaseActivity;
 import com.firebase.ui.auth.ui.account_link.WelcomeBackIDPPrompt;
+import com.firebase.ui.auth.ui.email.RegisterEmailActivity;
+import com.firebase.ui.auth.ui.email.SignInActivity;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.EmailAuthProvider;
@@ -30,19 +31,25 @@
 import java.util.Arrays;
 import java.util.List;
 
-public abstract class AcquireEmailActivity extends NoControllerBaseActivity {
-    protected static final int RC_REGISTER_ACCOUNT = 14;
-    protected static final int RC_WELCOME_BACK_IDP = 15;
-    protected static final int RC_SIGN_IN = 16;
-    private static final List<Integer> REQUEST_CODES = Arrays.asList(
+public class AcquireEmailHelper {
+    public static final int RC_REGISTER_ACCOUNT = 14;
+    public static final int RC_WELCOME_BACK_IDP = 15;
+    public static final int RC_SIGN_IN = 16;
+    public static final List<Integer> REQUEST_CODES = Arrays.asList(
             RC_REGISTER_ACCOUNT,
             RC_WELCOME_BACK_IDP,
             RC_SIGN_IN
     );
 
-    protected void checkAccountExists(final String email) {
-        FirebaseAuth firebaseAuth = getFirebaseAuth();
-        showLoadingDialog(R.string.progress_dialog_loading);
+    private ActivityHelper mActivityHelper;
+
+    public AcquireEmailHelper(ActivityHelper activityHelper) {
+        mActivityHelper = activityHelper;
+    }
+
+    public void checkAccountExists(final String email) {
+        FirebaseAuth firebaseAuth = mActivityHelper.getFirebaseAuth();
+        mActivityHelper.showLoadingDialog(R.string.progress_dialog_loading);
         if (email != null && !email.isEmpty()) {
             firebaseAuth.fetchProvidersForEmail(email).addOnCompleteListener(
                     new OnCompleteListener<ProviderQueryResult>() {
@@ -56,53 +63,51 @@ public void onComplete(@NonNull Task<ProviderQueryResult> task) {
     }
 
     private void startEmailHandler(String email, List<String> providers) {
-        dismissDialog();
+        mActivityHelper.dismissDialog();
         if (providers == null || providers.isEmpty()) {
             // account doesn't exist yet
             Intent registerIntent = RegisterEmailActivity.createIntent(
-                    AcquireEmailActivity.this,
+                    mActivityHelper.getApplicationContext(),
                     email,
-                    mTermsOfServiceUrl,
-                    mAppName
+                    mActivityHelper.termsOfServiceUrl,
+                    mActivityHelper.appName
             );
-            startActivityForResult(registerIntent, RC_REGISTER_ACCOUNT);
+            mActivityHelper.startActivityForResult(registerIntent, RC_REGISTER_ACCOUNT);
             return;
         } else {
             // account does exist
             for (String provider: providers) {
                 if (provider.equalsIgnoreCase(EmailAuthProvider.PROVIDER_ID)) {
                     Intent signInIntent = SignInActivity.createIntent(
-                            this,
-                            mAppName,
+                            mActivityHelper.getApplicationContext(),
+                            mActivityHelper.appName,
                             email,
-                            mProviderParcels
+                            mActivityHelper.providerParcels
                     );
-                    startActivityForResult(signInIntent, RC_SIGN_IN);
+                    mActivityHelper.startActivityForResult(signInIntent, RC_SIGN_IN);
                     return;
                 }
                 Intent intent = WelcomeBackIDPPrompt.createIntent(
-                        AcquireEmailActivity.this,
+                        mActivityHelper.getApplicationContext(),
                         provider,
-                        mProviderParcels,
-                        mAppName,
+                        mActivityHelper.providerParcels,
+                        mActivityHelper.appName,
                         email);
-                startActivityForResult(intent, RC_WELCOME_BACK_IDP);
+                mActivityHelper.startActivityForResult(intent, RC_WELCOME_BACK_IDP);
                 return;
             }
 
             Intent signInIntent = new Intent(
-                    AcquireEmailActivity.this, SignInActivity.class);
+                    mActivityHelper.getApplicationContext(), SignInActivity.class);
             signInIntent.putExtra(ControllerConstants.EXTRA_EMAIL, email);
-            startActivityForResult(signInIntent, RC_SIGN_IN);
+            mActivityHelper.startActivityForResult(signInIntent, RC_SIGN_IN);
             return;
         }
     }
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (REQUEST_CODES.contains(requestCode)) {
-            finish(resultCode, new Intent());
+            mActivityHelper.finish(resultCode, new Intent());
         }
     }
 }

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

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.firebase.ui.auth.ui;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class ActivityBase extends Activity {
+    protected ActivityHelper mActivityHelper;
+
+    @Override
+    protected void onCreate(Bundle savedInstance) {
+        super.onCreate(savedInstance);
+        mActivityHelper = new ActivityHelper(this, getIntent());
+    }
+
+    public void finish(int resultCode, Intent intent) {
+        mActivityHelper.finish(resultCode, intent);
+    }
+
+}

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

@@ -0,0 +1,119 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.firebase.ui.auth.ui;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.support.annotation.StringRes;
+
+import com.firebase.ui.auth.AuthUI;
+import com.firebase.ui.auth.choreographer.ControllerConstants;
+import com.firebase.ui.auth.choreographer.idp.provider.IDPProviderParcel;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+
+import java.util.ArrayList;
+
+public class ActivityHelper {
+    private ProgressDialog mProgressDialog;
+    private Activity mActivity;
+
+    public String appName;
+    public ArrayList<IDPProviderParcel> providerParcels;
+    public String termsOfServiceUrl;
+    public int theme;
+
+
+    public ActivityHelper(Activity activity, Intent intent) {
+        mActivity = activity;
+        appName = intent.getStringExtra(ControllerConstants.EXTRA_APP_NAME);
+        providerParcels = intent.getParcelableArrayListExtra(
+                ControllerConstants.EXTRA_PROVIDERS);
+        termsOfServiceUrl = intent.getStringExtra(
+                ControllerConstants.EXTRA_TERMS_OF_SERVICE_URL);
+        theme = intent.getIntExtra(
+                ControllerConstants.EXTRA_THEME,
+                AuthUI.DEFAULT_THEME);
+    }
+
+    public void dismissDialog() {
+        if (mProgressDialog != null && mProgressDialog.isShowing()) {
+            mProgressDialog.dismiss();
+            mProgressDialog = null;
+        }
+    }
+
+    public void showLoadingDialog(String message) {
+        dismissDialog();
+        mProgressDialog = ProgressDialog.show(mActivity, "", message, true);
+    }
+
+    public void showLoadingDialog(@StringRes int stringResource) {
+        showLoadingDialog(mActivity.getString(stringResource));
+    }
+
+
+    private Intent addExtras(Intent intent) {
+        intent.putExtra(ControllerConstants.EXTRA_APP_NAME, appName)
+                .putExtra(ControllerConstants.EXTRA_TERMS_OF_SERVICE_URL, termsOfServiceUrl)
+                .putExtra(ControllerConstants.EXTRA_THEME, theme)
+                .putExtra(ControllerConstants.EXTRA_PROVIDERS, providerParcels);
+        return intent;
+    }
+
+    public void startActivityForResult(Intent intent, int requestCode) {
+        mActivity.startActivityForResult(intent, requestCode);
+    }
+
+    public void finish(int resultCode, Intent intent) {
+        mActivity.setResult(resultCode, addExtras(intent));
+        mActivity.finish();
+    }
+
+    public Context getApplicationContext() {
+        return mActivity.getApplicationContext();
+    }
+
+
+    public FirebaseApp getFirebaseApp() {
+        return FirebaseApp.getInstance(appName);
+    }
+
+    public FirebaseApp getFirebaseApp(String apiaryKey, String applicationId) {
+        try{
+            return FirebaseApp.getInstance(appName);
+        } catch (IllegalStateException e) {
+            FirebaseOptions options
+                    = new FirebaseOptions.Builder()
+                    .setApiKey(apiaryKey)
+                    .setApplicationId(applicationId)
+                    .build();
+            return FirebaseApp.initializeApp(mActivity, options, appName);
+        }
+    }
+
+    public FirebaseAuth getFirebaseAuth() {
+        return FirebaseAuth.getInstance(getFirebaseApp());
+    }
+
+    public FirebaseUser getCurrentUser() {
+        return getFirebaseAuth().getCurrentUser();
+    }
+
+}

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.firebase.ui.auth.ui;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+public class AppCompatBase extends android.support.v7.app.AppCompatActivity {
+    protected ActivityHelper mActivityHelper;
+
+    @Override
+    protected void onCreate(Bundle savedInstance) {
+        super.onCreate(savedInstance);
+        mActivityHelper = new ActivityHelper(this, getIntent());
+    }
+
+    public void finish(int resultCode, Intent intent) {
+        mActivityHelper.finish(resultCode, intent);
+    }
+
+}