diff --git a/GoogleSignInPlugin/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml b/GoogleSignInPlugin/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml
index 625d2e51..900689e1 100644
--- a/GoogleSignInPlugin/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml
+++ b/GoogleSignInPlugin/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml
@@ -12,7 +12,7 @@
-
diff --git a/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h b/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h
index 5e77bc10..410f23db 100644
--- a/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h
+++ b/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h
@@ -15,6 +15,6 @@
*/
#import
@interface GoogleSignInHandler
- : NSObject
+ : NSObject
@end
diff --git a/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm b/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm
index 9b82a370..063222e5 100644
--- a/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm
+++ b/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm
@@ -105,9 +105,6 @@ - (void)signIn:(GIDSignIn *)signIn
case kGIDSignInErrorCodeKeychain:
currentResult_->result_code = kStatusCodeInternalError;
break;
- case kGIDSignInErrorCodeNoSignInHandlersInstalled:
- currentResult_->result_code = kStatusCodeDeveloperError;
- break;
case kGIDSignInErrorCodeHasNoAuthInKeychain:
currentResult_->result_code = kStatusCodeError;
break;
@@ -192,6 +189,8 @@ bool GoogleSignIn_Configure(void *unused, bool useGameSignIn,
[NSString stringWithUTF8String:accountName];
}
+ [GIDSignIn sharedInstance].presentingViewController = UnityGetGLViewController();
+
return !useGameSignIn;
}
@@ -239,7 +238,7 @@ bool GoogleSignIn_Configure(void *unused, bool useGameSignIn,
void *GoogleSignIn_SignInSilently() {
SignInResult *result = startSignIn();
if (!result) {
- [[GIDSignIn sharedInstance] signInSilently];
+ [[GIDSignIn sharedInstance] restorePreviousSignIn];
result = currentResult_.get();
}
return result;
diff --git a/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm b/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm
index 33631489..840aa5a5 100644
--- a/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm
+++ b/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm
@@ -75,7 +75,6 @@ - (BOOL)GoogleSignInAppController:(UIApplication *)application
// Setup the Sign-In instance.
GIDSignIn *signIn = [GIDSignIn sharedInstance];
signIn.clientID = clientId;
- signIn.uiDelegate = gsiHandler;
signIn.delegate = gsiHandler;
// looks like it's just calling itself, but the implementations were swapped
@@ -96,9 +95,7 @@ - (BOOL)GoogleSignInAppController:(UIApplication *)application
sourceApplication:sourceApplication
annotation:annotation];
- return [[GIDSignIn sharedInstance] handleURL:url
- sourceApplication:sourceApplication
- annotation:annotation] ||
+ return [[GIDSignIn sharedInstance] handleURL:url] ||
handled;
}
@@ -112,12 +109,7 @@ - (BOOL)GoogleSignInAppController:(UIApplication *)app
BOOL handled =
[self GoogleSignInAppController:app openURL:url options:options];
- return [[GIDSignIn sharedInstance]
- handleURL:url
- sourceApplication:
- options[UIApplicationOpenURLOptionsSourceApplicationKey]
- annotation:
- options[UIApplicationOpenURLOptionsAnnotationKey]] ||
+ return [[GIDSignIn sharedInstance] handleURL:url] ||
handled;
}