Skip to content

Commit aea1435

Browse files
committed
change return status value
1 parent bff1079 commit aea1435

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

GoogleSignIn/Impl/GoogleSignInImpl.cs

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ static IntPtr GoogleSignIn_SignInSilently(HandleRef self)
167167

168168
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") ?? -1;
170+
internal static int GoogleSignIn_Status(HandleRef self) => self.ToAndroidJavaObject()?.Call<int>("getStatus") ?? 6;
171171

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

@@ -337,15 +337,24 @@ public static AndroidJavaObject ToAndroidJavaObject(in this IntPtr intPtr)
337337
if(intPtr == IntPtr.Zero)
338338
return null;
339339

340+
try
341+
{
340342
#if UNITY_2022_2_OR_NEWER
341-
return new AndroidJavaObject(intPtr);
343+
return new AndroidJavaObject(intPtr);
342344
#else
343-
if(constructorInfo == null)
344-
constructorInfo = typeof(AndroidJavaObject).GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic,null,new[] { typeof(IntPtr) },null);
345+
if(constructorInfo == null)
346+
constructorInfo = typeof(AndroidJavaObject).GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic,null,new[] { typeof(IntPtr) },null);
345347

346-
Debug.Log(constructorInfo);
347-
return constructorInfo.Invoke(new object[] { intPtr }) as AndroidJavaObject;
348+
Debug.LogFormat("constructorInfo : {0}",constructorInfo);
349+
return constructorInfo.Invoke(new object[] { intPtr }) as AndroidJavaObject;
348350
#endif
351+
}
352+
catch(Exception e)
353+
{
354+
Debug.LogException(e);
355+
}
356+
357+
return null;
349358
}
350359
}
351360
}

0 commit comments

Comments
 (0)