Merge pull request #42 from hansemannn/TIMOB-20283

[TIMOB-20283] Fix iOS 8 crash, bump iOS to 5.0.1
tidev · Jan 30, 2016 · 5a08cc1 · 5a08cc1
2 parents 5634b18 + dffce41
commit 5a08cc1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/ios/Classes/FacebookModule.m b/ios/Classes/FacebookModule.m
@@ -48,7 +48,14 @@ -(BOOL)handleRelaunch
     launchOptions = [appDelegate launchOptions];
     NSString *urlString = [launchOptions objectForKey:@"url"];
     NSString *sourceApplication = [launchOptions objectForKey:@"source"];
-    NSString *annotation = [launchOptions objectForKey:UIApplicationOpenURLOptionsAnnotationKey];
+    NSString *annotation;
+
+    if ([TiUtils isIOS9OrGreater]) {
+        annotation = [launchOptions objectForKey:UIApplicationOpenURLOptionsAnnotationKey];
+    } else {
+        annotation = nil;
+    }
+
     if (urlString != nil) {
         FBSDKAccessToken *token = [FBSDKAccessToken currentAccessToken];
         NSSet* failed = token.declinedPermissions;

diff --git a/ios/Facebook_Prefix.pch b/ios/Facebook_Prefix.pch
@@ -1,4 +1,4 @@
 
 #ifdef __OBJC__
     #import <Foundation/Foundation.h>
-#endif
+#endif
diff --git a/ios/manifest b/ios/manifest
@@ -2,12 +2,12 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.0.0
+version: 5.0.1
 apiversion: 2
 description: Allows facebook integration for Titanium apps
 author: Mark Mokryn and Ng Chee Kiat
 license: Apache License Version 2.0
-copyright: Copyright (c) 2009-2015 by Appcelerator, Inc.
+copyright: Copyright (c) 2009-2016 by Appcelerator, Inc.
 
 # these should not be edited
 name: Facebook

diff --git a/ios/module.xcconfig b/ios/module.xcconfig
@@ -9,7 +9,7 @@
 
 //
 // How to add a Framework (example)
-FRAMEWORK_SEARCH_PATHS=$(SRCROOT)/../../modules/iphone/facebook/5.0.0/platform "~/Library/Application Support/Titanium/modules/iphone/facebook/5.0.0/platform"
+FRAMEWORK_SEARCH_PATHS=$(SRCROOT)/../../modules/iphone/facebook/5.0.1/platform "~/Library/Application Support/Titanium/modules/iphone/facebook/5.0.1/platform"
 OTHER_LDFLAGS=$(inherited) -framework Social -framework FBSDKCoreKit -framework FBSDKLoginKit -framework FBSDKShareKit
 //
 // OTHER_LDFLAGS=$(inherited) -framework Foo