From e655e104cd03fd977a49c42c01ca7f839bd76b2a Mon Sep 17 00:00:00 2001 From: Sam Stern Date: Thu, 11 Aug 2016 16:40:13 -0700 Subject: [PATCH] Fix bug in welcome back activity Change-Id: I0147c7a42abec06668fba6e14784c9460a0499a7 --- app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java | 2 ++ .../main/java/com/firebase/ui/auth/ui/AcquireEmailHelper.java | 3 +-- .../firebase/ui/auth/ui/account_link/WelcomeBackIDPPrompt.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java index 4bfbec800..40a23820b 100644 --- a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java +++ b/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 = diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/AcquireEmailHelper.java b/auth/src/main/java/com/firebase/ui/auth/ui/AcquireEmailHelper.java index 13428c37b..a43120d08 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/AcquireEmailHelper.java +++ b/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 providers) { public void onActivityResult(int requestCode, int resultCode, Intent data) { if (REQUEST_CODES.contains(requestCode)) { - mActivityHelper.finish(resultCode, new Intent()); + mActivityHelper.finish(resultCode, data); } } } diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIDPPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIDPPrompt.java index 1174e89a9..870d4d4ec 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIDPPrompt.java +++ b/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))