Skip to content

Commit 7709f87

Browse files
committed
Removing the subclassing of UnityAppController for iOS.
This avoids any issues when this plugin is used with others that need to handle deep links, etc. Also fixes a bug when trying to sign back in after signing out. Change-Id: Ia35f228a82c4744f83fb9955bc68366c68a828a7
1 parent f9bf400 commit 7709f87

File tree

7 files changed

+535
-348
lines changed

7 files changed

+535
-348
lines changed

GoogleSignInPlugin/Assets/GoogleSignIn/GoogleSignIn.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static GoogleSignIn() {
6666
public static GoogleSignInConfiguration Configuration {
6767
set {
6868
// Can set the configuration until the singleton is created.
69-
if (theInstance == null || theConfiguration == value) {
69+
if (theInstance == null || theConfiguration == value || theConfiguration == null) {
7070
theConfiguration = value;
7171
} else {
7272
throw new SignInException(GoogleSignInStatusCode.DeveloperError,
@@ -141,6 +141,7 @@ public Task<GoogleSignInUser> SignInSilently() {
141141
/// account to use when signing in.
142142
/// </remarks>
143143
public void SignOut() {
144+
theConfiguration = null;
144145
impl.SignOut();
145146
}
146147

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* Copyright 2017 Google Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
#import <GoogleSignIn/GIDSignIn.h>
17+
@interface GoogleSignInHandler
18+
: NSObject <GIDSignInDelegate, GIDSignInUIDelegate>
19+
20+
@end

GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h.meta

+35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)