[go: nahoru, domu]
Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

[google_sign_in] Fix deprecated API usage issue by upgrading CocoaPod to 5.0 #2127

Merged
merged 10 commits into from
Oct 29, 2019
Merged

[google_sign_in] Fix deprecated API usage issue by upgrading CocoaPod to 5.0 #2127

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
710283b
Fix Deprecated API Usage issue
collinjackson Sep 30, 2019
9b7eac5
Update to 5.0 compatibility
collinjackson Sep 30, 2019
89187b5
reformat
collinjackson Sep 30, 2019
46d23e3
Update to use [registrar messenger]
collinjackson Oct 1, 2019
f0bb3ce
Merge remote-tracking branch 'origin/master' into google_sign_in
collinjackson Oct 22, 2019
52ed349
Implement code review feedback
collinjackson Oct 22, 2019
34abc18
Remove dead code
collinjackson Oct 22, 2019
2faa78b
Merge remote-tracking branch 'origin/master' into google_sign_in
collinjackson Oct 25, 2019
bb5c3eb
format
collinjackson Oct 25, 2019
e3a79a8
Merge remote-tracking branch 'origin/master' into google_sign_in
collinjackson Oct 29, 2019
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
Prev Previous commit
Next Next commit
Update to 5.0 compatibility
  • Loading branch information
@collinjackson
collinjackson committed Sep 30, 2019
commit 9b7eac550e55751a7da62f471bf3da00deff9614
17 changes: 9 additions & 8 deletions packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
details:error.localizedDescription];
}

@interface FLTGoogleSignInPlugin () <GIDSignInDelegate, GIDSignInUIDelegate>
@interface FLTGoogleSignInPlugin () <GIDSignInDelegate>
@end

@implementation FLTGoogleSignInPlugin {
Expand All @@ -49,8 +49,7 @@ - (instancetype)init {
self = [super init];
if (self) {
[GIDSignIn sharedInstance].delegate = self;
[GIDSignIn sharedInstance].uiDelegate = self;


// On the iOS simulator, we get "Broken pipe" errors after sign-in for some
// unknown reason. We can avoid crashing the app by ignoring them.
signal(SIGPIPE, SIG_IGN);
Expand Down Expand Up @@ -84,11 +83,15 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
}
} else if ([call.method isEqualToString:@"signInSilently"]) {
if ([self setAccountRequest:result]) {
[[GIDSignIn sharedInstance] signInSilently];
[[GIDSignIn sharedInstance] restorePreviousSignIn];
}
} else if ([call.method isEqualToString:@"isSignedIn"]) {
result(@([[GIDSignIn sharedInstance] hasAuthInKeychain]));
result(@([[GIDSignIn sharedInstance] hasPreviousSignIn]));
} else if ([call.method isEqualToString:@"signIn"]) {
// TODO(jackson): It might be more appropriate to use controller of the FlutterView
UIViewController *controller = [UIApplication sharedApplication].keyWindow.rootViewController;
collinjackson marked this conversation as resolved.
Show resolved Hide resolved
[GIDSignIn sharedInstance].presentingViewController = controller;

if ([self setAccountRequest:result]) {
@try {
[[GIDSignIn sharedInstance] signIn];
Expand Down Expand Up @@ -136,9 +139,7 @@ - (BOOL)setAccountRequest:(FlutterResult)request {
- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options {
NSString *sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey];
id annotation = options[UIApplicationOpenURLOptionsAnnotationKey];
collinjackson marked this conversation as resolved.
Show resolved Hide resolved
return [[GIDSignIn sharedInstance] handleURL:url
sourceApplication:sourceApplication
annotation:annotation];
return [[GIDSignIn sharedInstance] handleURL:url];
}

#pragma mark - <GIDSignInUIDelegate> protocol
Expand Down