Merge pull request #685 from hello/jimmy/fb-fix

Fix issue with FB OAuth callback
hello · Sep 27, 2016 · f9892c2 · f9892c2
2 parents 30ebaa0 + d1354dd
commit f9892c2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.5.3.11
+
+Fixes:
+
+* Fix issue where FB Oauth response was not properly being routed back to the app
+
 ## 1.5.3.10
 
 Fixes:

diff --git a/Extensions/RoomConditions/Info.plist b/Extensions/RoomConditions/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.3.10</string>
+	<string>1.5.3.11</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>

diff --git a/SleepModel/HEMAppDelegate.m b/SleepModel/HEMAppDelegate.m
@@ -57,26 +57,21 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
     return YES;
 }
 
-- (BOOL)application:(UIApplication *)app
-            openURL:(NSURL *)url
-            options:(NSDictionary<NSString *,id> *)options {
-    NSString* lastPath = [url lastPathComponent];
-    if ([lastPath isEqualToString:kHEMAppExtRoom]) {
-        NSDictionary* props = @{kHEMAnalyticsEventPropExtUrl : [url absoluteString] ?: @""};
-        [SENAnalytics track:kHEMAnalyticsEventLaunchedFromExt properties:props];
-        HEMRootViewController* rootVC = [HEMRootViewController rootViewControllerForKeyWindow];
-        [rootVC showSettingsDrawerTabAtIndex:HEMRootDrawerTabConditions animated:YES];
-        return YES;
-    }
-    return NO;
-}
-
 - (BOOL)application:(UIApplication *)application
             openURL:(NSURL *)url
   sourceApplication:(NSString *)sourceApplication
          annotation:(id)annotation {
     HEMFacebookService* fb = [HEMFacebookService new];
-    return [fb open:application url:url source:sourceApplication annotation:annotation];
+    if (![fb open:application url:url source:sourceApplication annotation:annotation]) {
+        NSString* lastPath = [url lastPathComponent];
+        if ([lastPath isEqualToString:kHEMAppExtRoom]) {
+            NSDictionary* props = @{kHEMAnalyticsEventPropExtUrl : [url absoluteString] ?: @""};
+            [SENAnalytics track:kHEMAnalyticsEventLaunchedFromExt properties:props];
+            HEMRootViewController* rootVC = [HEMRootViewController rootViewControllerForKeyWindow];
+            [rootVC showSettingsDrawerTabAtIndex:HEMRootDrawerTabConditions animated:YES];
+        }
+    }
+    return YES;
 }
 
 - (void)application:(UIApplication *)application performActionForShortcutItem:(UIApplicationShortcutItem *)shortcutItem completionHandler:(void (^)(BOOL))completionHandler {

diff --git a/SleepModel/Sense-Info.plist b/SleepModel/Sense-Info.plist
@@ -35,7 +35,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.5.3.10</string>
+	<string>1.5.3.11</string>
 	<key>FacebookAppID</key>
 	<string>372438546161587</string>
 	<key>FacebookDisplayName</key>