Skip to content

Fix bug in Smart Lock not restoring Twitter credentials #356

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 3 commits into from
Oct 17, 2016
Merged

Fix bug in Smart Lock not restoring Twitter credentials #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd16c43
Fix bug in Smart Lock not restoring Twitter credentials
SUPERCILEX Oct 15, 2016
4c8ba90
Update ChooseAccountActivity.java
SUPERCILEX Oct 15, 2016
cdfdc2f
Update ChooseAccountActivity.java
SUPERCILEX Oct 15, 2016
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
8 changes: 8 additions & 0 deletions auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import com.google.firebase.auth.FacebookAuthProvider;
import com.google.firebase.auth.FirebaseAuthInvalidUserException;
import com.google.firebase.auth.GoogleAuthProvider;
import com.google.firebase.auth.TwitterAuthProvider;

import java.util.List;

Expand Down Expand Up @@ -326,6 +327,13 @@ protected void redirectToIdpSignIn(String email, String accountType) {
FacebookAuthProvider.PROVIDER_ID,
email);
break;
case IdentityProviders.TWITTER:
nextIntent = IDPSignInContainerActivity.createIntent(
this,
mActivityHelper.getFlowParams(),
TwitterAuthProvider.PROVIDER_ID,
email);
break;
default:
Log.w(TAG, "unknown provider: " + accountType);
nextIntent = AuthMethodPickerActivity.createIntent(
Expand Down
4 changes: 4 additions & 0 deletions auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.firebase.ui.auth.provider.IDPProvider;
import com.firebase.ui.auth.provider.IDPProviderParcel;
import com.firebase.ui.auth.provider.IDPResponse;
import com.firebase.ui.auth.provider.TwitterProvider;
import com.firebase.ui.auth.ui.ActivityHelper;
import com.firebase.ui.auth.ui.ExtraConstants;
import com.firebase.ui.auth.ui.FlowParameters;
Expand All @@ -33,6 +34,7 @@
import com.google.firebase.auth.FacebookAuthProvider;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.GoogleAuthProvider;
import com.google.firebase.auth.TwitterAuthProvider;

public class IDPSignInContainerActivity extends IDPBaseActivity implements IDPProvider.IDPCallback {
private static final String TAG = "IDPSignInContainer";
Expand Down Expand Up @@ -63,6 +65,8 @@ protected void onCreate(Bundle savedInstanceState) {
mIDPProvider = new FacebookProvider(this, providerParcel);
} else if (mProvider.equalsIgnoreCase(GoogleAuthProvider.PROVIDER_ID)) {
mIDPProvider = new GoogleProvider(this, providerParcel, mEmail);
} else if (mProvider.equalsIgnoreCase(TwitterAuthProvider.PROVIDER_ID)) {
mIDPProvider = new TwitterProvider(this, providerParcel);
}
mIDPProvider.setAuthenticationCallback(this);
mIDPProvider.startLogin(this);
Expand Down