#3 redirect url not handled when redirected from Google+ app on iOS

EddyVerbruggen · Oct 12, 2014 · 931c315 · 931c315
1 parent 66b6c35
commit 931c315
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="nl.x-services.plugins.googleplus"
-        version="1.0.1">
+        version="1.0.2">
 
   <name>Google+</name>
 

diff --git a/src/ios/GooglePlus.h b/src/ios/GooglePlus.h
@@ -4,6 +4,7 @@
 @interface GooglePlus : CDVPlugin<GPPSignInDelegate>
 
 @property (nonatomic, copy) NSString* callbackId;
+@property (nonatomic, assign) BOOL isSigningIn;
 
 - (void) login:(CDVInvokedUrlCommand*)command;
 - (void) trySilentLogin:(CDVInvokedUrlCommand*)command;

diff --git a/src/ios/GooglePlus.m b/src/ios/GooglePlus.m
@@ -18,19 +18,22 @@ - (BOOL)identity_application: (UIApplication *)application
            sourceApplication: (NSString *)sourceApplication
                   annotation: (id)annotation {
 
-  if (url && [url.path rangeOfString:@"oauth2callback"].location != NSNotFound) {
+  GooglePlus* gp = (GooglePlus*)[[self.viewController pluginObjects] objectForKey:@"GooglePlus"];
+
+  if ([gp isSigningIn]) {
+    gp.isSigningIn = NO;
     return [GPPURLHandler handleURL:url sourceApplication:sourceApplication annotation:annotation];
   } else {
     // call super
     return [self identity_application:application openURL:url sourceApplication:sourceApplication annotation:annotation];
   }
 }
-
 @end
 
 @implementation GooglePlus
 
 - (void) login:(CDVInvokedUrlCommand*)command {
+  self.isSigningIn = YES;
   [[self getGooglePlusSignInObject:command] authenticate];
 }