diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64c82791..6ed8faa4 100644
--- 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
index aaac9d25..e8930093 100644
--- a/Extensions/RoomConditions/Info.plist
+++ b/Extensions/RoomConditions/Info.plist
@@ -21,7 +21,7 @@
CFBundleSignature
????
CFBundleVersion
- 1.5.3.10
+ 1.5.3.11
NSExtension
NSExtensionMainStoryboard
diff --git a/SleepModel/HEMAppDelegate.m b/SleepModel/HEMAppDelegate.m
index 5faf689d..df448303 100644
--- 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 *)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
index e06a5089..66af5f1e 100644
--- a/SleepModel/Sense-Info.plist
+++ b/SleepModel/Sense-Info.plist
@@ -35,7 +35,7 @@
CFBundleVersion
- 1.5.3.10
+ 1.5.3.11
FacebookAppID
372438546161587
FacebookDisplayName