From fd16c430d9d51f8158daabd892328a96522e9ecd Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Fri, 14 Oct 2016 22:15:24 -0700 Subject: [PATCH 1/3] Fix bug in Smart Lock not restoring Twitter credentials --- .../com/firebase/ui/auth/ui/ChooseAccountActivity.java | 8 ++++++++ .../ui/auth/ui/idp/IDPSignInContainerActivity.java | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java index 11ccfd536..446fb7d43 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java @@ -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; @@ -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( diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java index 998a72f70..910e9031e 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java @@ -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; @@ -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"; @@ -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); From 4c8ba90ba7984036e6cffda5380e431ca9fadbb6 Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Fri, 14 Oct 2016 23:14:28 -0700 Subject: [PATCH 2/3] Update ChooseAccountActivity.java --- .../java/com/firebase/ui/auth/ui/ChooseAccountActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java index 446fb7d43..5a378a59a 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java @@ -10,7 +10,7 @@ * 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; From cdfdc2f189bfe0229643d5d53d554b9bd9dd2d8d Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Fri, 14 Oct 2016 23:14:40 -0700 Subject: [PATCH 3/3] Update ChooseAccountActivity.java --- .../java/com/firebase/ui/auth/ui/ChooseAccountActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java index 5a378a59a..446fb7d43 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java @@ -10,7 +10,7 @@ * 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;