Skip to content
Closed
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.google.android.gms.auth.api.signin.internal.Storage;
import com.google.android.gms.common.api.ApiException;
import com.google.android.gms.common.api.Scope;
import com.google.android.gms.common.api.Status;
import com.google.android.gms.tasks.Task;
import com.google.android.gms.tasks.Tasks;
import org.microg.gms.auth.api.signin.GoogleSignInCommon;
Expand Down Expand Up @@ -106,8 +107,19 @@ public static GoogleSignInAccount getLastSignedInAccount(@NonNull Context contex
@NonNull
public static Task<GoogleSignInAccount> getSignedInAccountFromIntent(@Nullable Intent data) {
GoogleSignInResult signInResultFromIntent = GoogleSignInCommon.getSignInResultFromIntent(data);
if (signInResultFromIntent == null) {
return Tasks.forException(new ApiException(Status.INTERNAL_ERROR));
}
GoogleSignInAccount signInAccount = signInResultFromIntent.getSignInAccount();
return (!signInResultFromIntent.isSuccess() || signInAccount == null) ? Tasks.forException(new ApiException(signInResultFromIntent.getStatus())) : Tasks.forResult(signInAccount);
Status status = signInResultFromIntent.getStatus();
if (!signInResultFromIntent.isSuccess() || signInAccount == null) {
if (status == null) {
return Tasks.forException(new ApiException(Status.INTERNAL_ERROR));
} else {
return Tasks.forException(new ApiException(status));
}
}
return Tasks.forResult(signInAccount);
}

/**
Expand Down