Merge pull request #250 from samtstern/master

Fix bug in welcome back activity

Author: samtstern

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

@@ -40,6 +40,8 @@
 
 public class AuthUiActivity extends AppCompatActivity {
 
+    private static final String TAG = "AuthUIActivity";
+
     private static final String UNCHANGED_CONFIG_VALUE = "CHANGE-ME";
 
     private static final String GOOGLE_TOS_URL =

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

@@ -16,7 +16,6 @@
 
 import android.content.Intent;
 import android.support.annotation.NonNull;
-import android.util.Log;
 
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ui.account_link.WelcomeBackIDPPrompt;
@@ -111,7 +110,7 @@ private void startEmailHandler(String email, List<String> providers) {
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (REQUEST_CODES.contains(requestCode)) {
-            mActivityHelper.finish(resultCode, new Intent());
+            mActivityHelper.finish(resultCode, data);
         }
     }
 }

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

@@ -94,6 +94,7 @@ protected void onCreate(Bundle savedInstanceState) {
                     "Firebase login successful. Account linking failed due to provider not "
                             + "enabled by application");
             finish(RESULT_CANCELED, getIntent());
+            return;
         }
 
         ((TextView) findViewById(R.id.welcome_back_idp_prompt))