Skip to content

Commit bff1079

Browse files
ThainaThaina
committed
add timeout to await for silentSignIn
1 parent 9aa40ab commit bff1079

File tree

2 files changed

+55
-44
lines changed

2 files changed

+55
-44
lines changed

‎GoogleSignIn/Impl/GoogleSignInImpl.cs

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -161,29 +161,29 @@ static IntPtr GoogleSignIn_SignInSilently(HandleRef self)
161161

162162
static void GoogleSignIn_Disconnect(HandleRef self) => GoogleSignInHelper.CallStatic("disconnect",parentActivity);
163163

164-
internal static void GoogleSignIn_DisposeFuture(HandleRef self) => self.ToAndroidJavaObject().Dispose();
164+
internal static void GoogleSignIn_DisposeFuture(HandleRef self) => self.ToAndroidJavaObject()?.Dispose();
165165

166-
internal static bool GoogleSignIn_Pending(HandleRef self) => self.ToAndroidJavaObject().Call<bool>("isPending");
166+
internal static bool GoogleSignIn_Pending(HandleRef self) => self.ToAndroidJavaObject()?.Call<bool>("isPending") ?? false;
167167

168-
internal static IntPtr GoogleSignIn_Result(HandleRef self) => self.ToAndroidJavaObject().Call<AndroidJavaObject>("getAccount").GetRawObject();
168+
internal static IntPtr GoogleSignIn_Result(HandleRef self) => self.ToAndroidJavaObject()?.Call<AndroidJavaObject>("getAccount")?.GetRawObject() ?? IntPtr.Zero;
169169

170-
internal static int GoogleSignIn_Status(HandleRef self) => self.ToAndroidJavaObject().Call<int>("getStatus");
170+
internal static int GoogleSignIn_Status(HandleRef self) => self.ToAndroidJavaObject()?.Call<int>("getStatus") ?? -1;
171171

172-
internal static string GoogleSignIn_GetServerAuthCode(HandleRef self) => self.ToAndroidJavaObject().Call<string>("getServerAuthCode");
172+
internal static string GoogleSignIn_GetServerAuthCode(HandleRef self) => self.ToAndroidJavaObject()?.Call<string>("getServerAuthCode");
173173

174-
internal static string GoogleSignIn_GetDisplayName(HandleRef self) => self.ToAndroidJavaObject().Call<string>("getDisplayName");
174+
internal static string GoogleSignIn_GetDisplayName(HandleRef self) => self.ToAndroidJavaObject()?.Call<string>("getDisplayName");
175175

176-
internal static string GoogleSignIn_GetEmail(HandleRef self) => self.ToAndroidJavaObject().Call<string>("getEmail");
176+
internal static string GoogleSignIn_GetEmail(HandleRef self) => self.ToAndroidJavaObject()?.Call<string>("getEmail");
177177

178-
internal static string GoogleSignIn_GetFamilyName(HandleRef self) => self.ToAndroidJavaObject().Call<string>("getFamilyName");
178+
internal static string GoogleSignIn_GetFamilyName(HandleRef self) => self.ToAndroidJavaObject()?.Call<string>("getFamilyName");
179179

180-
internal static string GoogleSignIn_GetGivenName(HandleRef self) => self.ToAndroidJavaObject().Call<string>("getGivenName");
180+
internal static string GoogleSignIn_GetGivenName(HandleRef self) => self.ToAndroidJavaObject()?.Call<string>("getGivenName");
181181

182-
internal static string GoogleSignIn_GetIdToken(HandleRef self) => self.ToAndroidJavaObject().Call<string>("getIdToken");
182+
internal static string GoogleSignIn_GetIdToken(HandleRef self) => self.ToAndroidJavaObject()?.Call<string>("getIdToken");
183183

184-
internal static string GoogleSignIn_GetImageUrl(HandleRef self) => self.ToAndroidJavaObject().Call<AndroidJavaObject>("getPhotoUrl").Call<string>("toString");
184+
internal static string GoogleSignIn_GetImageUrl(HandleRef self) => self.ToAndroidJavaObject()?.Call<AndroidJavaObject>("getPhotoUrl")?.Call<string>("toString");
185185

186-
internal static string GoogleSignIn_GetUserId(HandleRef self) => self.ToAndroidJavaObject().Call<string>("getId");
186+
internal static string GoogleSignIn_GetUserId(HandleRef self) => self.ToAndroidJavaObject()?.Call<string>("getId");
187187
#else
188188
private const string DllName = "__Internal";
189189

@@ -334,6 +334,9 @@ public static class Ext
334334
public static AndroidJavaObject ToAndroidJavaObject(in this HandleRef self) => self.Handle.ToAndroidJavaObject();
335335
public static AndroidJavaObject ToAndroidJavaObject(in this IntPtr intPtr)
336336
{
337+
if(intPtr == IntPtr.Zero)
338+
return null;
339+
337340
#if UNITY_2022_2_OR_NEWER
338341
return new AndroidJavaObject(intPtr);
339342
#else

‎Plugins/Android/src/main/java/com/google/googlesignin/GoogleSignInFragment.java

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@
3535
import com.google.android.gms.common.api.PendingResult;
3636
import com.google.android.gms.common.api.ResultCallback;
3737
import com.google.android.gms.common.api.Scope;
38+
import com.google.android.gms.common.api.Status;
3839
import java.lang.reflect.Field;
3940
import java.lang.reflect.InvocationTargetException;
4041
import java.lang.reflect.Method;
4142
import java.util.Locale;
43+
import java.util.concurrent.TimeUnit;
4244

4345
/**
4446
* Activity fragment with no UI added to the parent activity in order to manage the accessing of the
@@ -62,15 +64,19 @@ void DoSignIn(boolean silent) {
6264
Auth.GoogleSignInApi.silentSignIn(mGoogleApiClient).setResultCallback(new ResultCallback<GoogleSignInResult>() {
6365
@Override
6466
public void onResult(@NonNull GoogleSignInResult googleSignInResult) {
65-
if (!googleSignInResult.isSuccess()) {
66-
GoogleSignInHelper.logError(
67-
"Error with " + "silentSignIn: " + googleSignInResult.getStatus());
67+
if(googleSignInResult == null) {
68+
GoogleSignInHelper.logError("Error with silentSignIn: googleSignInResult is null");
69+
GoogleSignInHelper.nativeOnResult(request.getHandle(),CommonStatusCodes.INTERNAL_ERROR,null);
70+
return;
6871
}
6972

70-
GoogleSignInHelper.nativeOnResult(
71-
request.getHandle(),
72-
googleSignInResult.getStatus().getStatusCode(),
73-
googleSignInResult.getSignInAccount());
73+
Status status = googleSignInResult.getStatus();
74+
GoogleSignInAccount acct = googleSignInResult.isSuccess() ? googleSignInResult.getSignInAccount() : null;
75+
if (acct == null) {
76+
GoogleSignInHelper.logError("Error with silentSignIn: " + status);
77+
}
78+
79+
GoogleSignInHelper.nativeOnResult(request.getHandle(),status != null ? status.getStatusCode() : CommonStatusCodes.INTERNAL_ERROR,acct);
7480
setState(State.READY);
7581
}
7682
});
@@ -153,15 +159,22 @@ public TokenRequest getRequest() {
153159
private PendingResult<TokenResult> tokenPendingResult = null;
154160

155161
public GoogleSignInAccount getAccount() {
156-
return tokenPendingResult.await().getAccount();
162+
if(tokenPendingResult == null || tokenPendingResult.isCanceled())
163+
return null;
164+
165+
return tokenPendingResult.await(3,TimeUnit.SECONDS).getAccount();
157166
}
158167

159168
public int getStatus() {
160169
if(tokenPendingResult == null) {
161170
return CommonStatusCodes.DEVELOPER_ERROR;
162171
}
163172

164-
return tokenPendingResult.await().getStatus().getStatusCode();
173+
if(tokenPendingResult.isCanceled()) {
174+
return CommonStatusCodes.CANCELED;
175+
}
176+
177+
return tokenPendingResult.await(3,TimeUnit.SECONDS).getStatus().getStatusCode();
165178
}
166179

167180
private GoogleApiClient mGoogleApiClient;
@@ -287,34 +300,29 @@ private void processRequest(final boolean silent) {
287300
}
288301

289302
setState(State.BUSY);
290-
request
291-
.getPendingResponse()
292-
.setResultCallback(
293-
new ResultCallback<TokenResult>() {
294-
@Override
295-
public void onResult(@NonNull TokenResult tokenResult) {
296-
GoogleSignInHelper.logDebug(
297-
String.format(
298-
Locale.getDefault(),
299-
"Calling nativeOnResult: handle: %s, status: %d acct: %s",
300-
tokenResult.getHandle(),
301-
tokenResult.getStatus().getStatusCode(),
302-
tokenResult.getAccount()));
303-
GoogleSignInHelper.nativeOnResult(
304-
tokenResult.getHandle(),
305-
tokenResult.getStatus().getStatusCode(),
306-
tokenResult.getAccount());
307-
clearRequest(false);
308-
}
309-
});
303+
request.getPendingResponse().setResultCallback(new ResultCallback<TokenResult>() {
304+
@Override
305+
public void onResult(@NonNull TokenResult tokenResult) {
306+
GoogleSignInHelper.logDebug(
307+
String.format(
308+
Locale.getDefault(),
309+
"Calling nativeOnResult: handle: %s, status: %d acct: %s",
310+
tokenResult.getHandle(),
311+
tokenResult.getStatus().getStatusCode(),
312+
tokenResult.getAccount()));
313+
GoogleSignInHelper.nativeOnResult(
314+
tokenResult.getHandle(),
315+
tokenResult.getStatus().getStatusCode(),
316+
tokenResult.getAccount());
317+
clearRequest(false);
318+
}
319+
});
310320

311321
// Build the GoogleAPIClient
312322
buildClient(request);
313323

314-
GoogleSignInHelper.logDebug(
315-
" Has connected == " + mGoogleApiClient.hasConnectedApi(Auth.GOOGLE_SIGN_IN_API));
324+
GoogleSignInHelper.logDebug(" Has connected == " + mGoogleApiClient.hasConnectedApi(Auth.GOOGLE_SIGN_IN_API));
316325
if (!mGoogleApiClient.hasConnectedApi(Auth.GOOGLE_SIGN_IN_API)) {
317-
318326
DoSignIn(silent);
319327
}
320328
} catch (Throwable throwable) {

0 commit comments

Comments
 (0)