Skip to content

Avoid error when canceling google signin #1443

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
samtstern merged 3 commits into from
Sep 12, 2018
Merged

Avoid error when canceling google signin #1443

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
390b78a
upgrade google play auth version
diedu89 Sep 12, 2018
98aa3c8
Handle user cancellation in google signin
diedu89 Sep 12, 2018
4206eb6
Merge branch 'master' of github.com:diedu89/FirebaseUI-Android
diedu89 Sep 12, 2018
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
6 changes: 5 additions & 1 deletion auth/src/main/java/com/firebase/ui/auth/data/remote/GoogleSignInHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.firebase.ui.auth.data.model.IntentRequiredException;
import com.firebase.ui.auth.data.model.Resource;
import com.firebase.ui.auth.data.model.User;
import com.firebase.ui.auth.data.model.UserCancellationException;
import com.firebase.ui.auth.ui.HelperActivityBase;
import com.firebase.ui.auth.util.ExtraConstants;
import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
Expand Down Expand Up @@ -96,7 +97,10 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
// Hack for https://github.com/googlesamples/google-services/issues/345
// Google remembers the account so the picker doesn't appear twice for the user.
start();
} else {
}else if(e.getStatusCode() == GoogleSignInStatusCodes.SIGN_IN_CANCELLED){
setResult(Resource.<IdpResponse>forFailure(new UserCancellationException()));
}
else {
if (e.getStatusCode() == CommonStatusCodes.DEVELOPER_ERROR) {
Log.w(TAG, "Developer error: this application is misconfigured. " +
"Check your SHA1 and package name in the Firebase console.");
Expand Down
3 changes: 2 additions & 1 deletion buildSrc/src/main/kotlin/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@ object Config {
}

object PlayServices {
const val auth = "com.google.android.gms:play-services-auth:15.0.1"
const val auth = "com.google.android.gms:play-services-auth:16.0.0"
}


object Provider {
const val facebook = "com.facebook.android:facebook-login:4.33.0"
const val twitter = "com.twitter.sdk.android:twitter-core:3.1.1@aar"
Expand Down