Skip to content

Fix bug in welcome back activity #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2016
Merged

Fix bug in welcome back activity #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
3 changes: 1 addition & 2 deletions auth/src/main/java/com/firebase/ui/auth/ui/AcquireEmailHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}
}
1 change: 1 addition & 0 deletions auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIDPPrompt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down