Facebook iOS SDK 4.27.1

Summary: see https://developers.facebook.com/docs/ios/change-log-4.x/ Upgrading: https://developers.facebook.com/docs/ios/upgrading/
facebook · Oct 10, 2017 · 81319e3 · 81319e3
2 parents 58bace5 + 0dbdc2f
commit 81319e3
Show file tree

Hide file tree

Showing 20 changed files with 58 additions and 23 deletions.
diff --git a/Configurations/Version.xcconfig b/Configurations/Version.xcconfig
@@ -17,5 +17,6 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // The versions for FBSDK and Messenger SDK.
-FBSDK_PROJECT_VERSION=4.27.0
+FBSDK_PROJECT_VERSION=4.27.1
 MNSDK_PROJECT_VERSION=TODO_SUPPORT_MNSDK
+
diff --git a/FBSDKCoreKit.podspec b/FBSDKCoreKit.podspec
@@ -3,7 +3,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "FBSDKCoreKit"
-  s.version      = "4.27.0"
+  s.version      = "4.27.1"
   s.summary      = "Official Facebook SDK for iOS to access Facebook Platform's core features"
 
   s.description  = <<-DESC
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target = '9.0'
 
   s.source       = { :git => "https://github.com/facebook/facebook-ios-sdk.git",
-                     :tag => "sdk-version-4.27.0"
+                     :tag => "sdk-version-4.27.1"
                     }
 
   s.ios.weak_frameworks = 'Accounts', 'CoreLocation', 'Social', 'Security', 'QuartzCore', 'CoreGraphics', 'UIKit', 'Foundation', 'AudioToolbox'

diff --git a/FBSDKCoreKit/FBSDKCoreKit.xcodeproj/project.pbxproj b/FBSDKCoreKit/FBSDKCoreKit.xcodeproj/project.pbxproj
@@ -2803,13 +2803,15 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 81A4A6031D19BE0400D5BF66 /* FBSDKCoreKit.xcconfig */;
 			buildSettings = {
+				"FB_BITCODE_FLAG[sdk=iphoneos11.0]" = "-fembed-bitcode";
 			};
 			name = Debug;
 		};
 		9D26975F1A5DF40700143BFC /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 81A4A6031D19BE0400D5BF66 /* FBSDKCoreKit.xcconfig */;
 			buildSettings = {
+				"FB_BITCODE_FLAG[sdk=iphoneos11.0]" = "-fembed-bitcode";
 			};
 			name = Release;
 		};

diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppEvents.h b/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppEvents.h
@@ -97,6 +97,14 @@ FBSDK_EXTERN NSString *const FBSDKAppEventNameViewedContent;
  of methods on `FBSDKAppEvents`.  Common event names are provided in the `FBAppEventName*` constants.
  */
 
+ /**
+  * Parameter key used to specify data for the one or more pieces of content being logged about.
+  * Data should be a JSON encoded string.
+  * Example:
+  * "[{\"id\": \"1234\", \"quantity\": 2, \"item_price\": 5.99}, {\"id\": \"5678\", \"quantity\": 1, \"item_price\": 9.99}]"
+  */
+FBSDK_EXTERN NSString *const FBSDKAppEventParameterNameContent;
+
 /** Parameter key used to specify an ID for the specific piece of content being logged about.  Could be an EAN, article identifier, etc., depending on the nature of the app. */
 FBSDK_EXTERN NSString *const FBSDKAppEventParameterNameContentID;
 

diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppEvents.m b/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppEvents.m
@@ -67,6 +67,7 @@
 NSString *const FBSDKAppEventParameterNameCurrency               = @"fb_currency";
 NSString *const FBSDKAppEventParameterNameRegistrationMethod     = @"fb_registration_method";
 NSString *const FBSDKAppEventParameterNameContentType            = @"fb_content_type";
+NSString *const FBSDKAppEventParameterNameContent                = @"fb_content";
 NSString *const FBSDKAppEventParameterNameContentID              = @"fb_content_id";
 NSString *const FBSDKAppEventParameterNameSearchString           = @"fb_search_string";
 NSString *const FBSDKAppEventParameterNameSuccess                = @"fb_success";
@@ -329,7 +330,7 @@ + (void)logEvent:(NSString *)eventName
   [[FBSDKAppEvents singleton] instanceLogEvent:eventName
                                     valueToSum:valueToSum
                                     parameters:parameters
-                            isImplicitlyLogged:NO
+                            isImplicitlyLogged:(BOOL)parameters[FBSDKAppEventParameterImplicitlyLogged]
                                    accessToken:accessToken];
 }
 

diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.h b/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.h
@@ -50,7 +50,7 @@
  - Parameter annotation: The annotation as passed to [UIApplicationDelegate application:openURL:sourceApplication:annotation:].
 
  - Returns: YES if the url was intended for the Facebook SDK, NO if not.
-  */
+ */
 - (BOOL)application:(UIApplication *)application
             openURL:(NSURL *)url
   sourceApplication:(NSString *)sourceApplication

diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.m b/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.m
@@ -242,8 +242,10 @@ - (void)applicationDidBecomeActive:(NSNotification *)notification
   // within the app delegate's lifecycle like openURL, in which case there
   // might have been a "didBecomeActive" event pending that we want to ignore.
   BOOL notExpectingBackground = !_expectingBackground && !_safariViewController && !_isDismissingSafariViewController;
-#ifdef __IPHONE_11_0
+#if !TARGET_OS_TV
+ #ifdef __IPHONE_11_0
   notExpectingBackground = notExpectingBackground && !_authenticationSession;
+ #endif
 #endif
   if (notExpectingBackground) {
     _active = YES;

diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKCoreKit.h b/FBSDKCoreKit/FBSDKCoreKit/FBSDKCoreKit.h
@@ -44,5 +44,5 @@
 #import <FBSDKCoreKit/FBSDKDeviceViewControllerBase.h>
 #endif
 
-#define FBSDK_VERSION_STRING @"4.27.0"
+#define FBSDK_VERSION_STRING @"4.27.1"
 #define FBSDK_TARGET_PLATFORM_VERSION @"v2.10"
diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKProfile.m b/FBSDKCoreKit/FBSDKCoreKit/FBSDKProfile.m
@@ -88,7 +88,7 @@ - (NSURL *)imageURLForPictureMode:(FBSDKProfilePictureMode)mode size:(CGSize)siz
 {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  NSString *path = [self imagePathForPictureMode:FBSDKProfilePictureModeNormal size:size];
+  NSString *path = [self imagePathForPictureMode:mode size:size];
 #pragma clang diagnostic pop
   return [FBSDKInternalUtility facebookURLWithHostPrefix:@"graph"
                                                     path:path
@@ -278,9 +278,14 @@ + (FBSDKProfile *)fetchCachedProfile
 {
   NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
   NSData *data = [userDefaults objectForKey:FBSDKProfileUserDefaultsKey];
-  return (data != nil)
-    ? [NSKeyedUnarchiver unarchiveObjectWithData:data]
-    : nil;
+  if (data != nil) {
+    @try {
+      return [NSKeyedUnarchiver unarchiveObjectWithData:data];
+    } @catch (NSException *exception) {
+      return nil;
+    }
+  }
+  return nil;
 }
 
 @end
diff --git a/FBSDKCoreKit/FBSDKCoreKit/Internal/AppEvents/FBSDKPaymentObserver.m b/FBSDKCoreKit/FBSDKCoreKit/Internal/AppEvents/FBSDKPaymentObserver.m
@@ -25,7 +25,7 @@
 #import "FBSDKLogger.h"
 #import "FBSDKSettings.h"
 
-static NSString *const FBSDKAppEventParameterImplicitlyLoggedPurchase    = @"_implicitlyLoggedPurchaseEvent";
+static NSString *const FBSDKAppEventParameterImplicitlyLoggedPurchase = @"_implicitlyLogged";
 static NSString *const FBSDKAppEventNamePurchaseFailed = @"fb_mobile_purchase_failed";
 static NSString *const FBSDKAppEventParameterNameProductTitle = @"fb_content_title";
 static NSString *const FBSDKAppEventParameterNameTransactionID = @"fb_transaction_id";
@@ -121,6 +121,10 @@ - (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)tran
 
 - (void)handleTransaction:(SKPaymentTransaction *)transaction
 {
+  // Ignore restored transaction
+  if (transaction.originalTransaction != nil) {
+    return;
+  }
   FBSDKPaymentProductRequestor *productRequest = [[FBSDKPaymentProductRequestor alloc] initWithTransaction:transaction];
   [productRequest resolveProducts];
 }
@@ -269,7 +273,7 @@ - (void)logImplicitPurchaseEvent:(NSString *)eventName
   [eventParameters setObject:@"1" forKey:FBSDKAppEventParameterImplicitlyLoggedPurchase];
   [FBSDKAppEvents logEvent:eventName
                 valueToSum:valueToSum
-                parameters:parameters];
+                parameters:eventParameters];
 
   // Unless the behavior is set to only allow explicit flushing, we go ahead and flush, since purchase events
   // are relatively rare and relatively high value and worth getting across on wire right away.

diff --git a/FBSDKLoginKit.podspec b/FBSDKLoginKit.podspec
@@ -3,7 +3,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "FBSDKLoginKit"
-  s.version      = "4.27.0"
+  s.version      = "4.27.1"
   s.summary      = "Official Facebook SDK for iOS to access Facebook Platform with features like Login, Share and Message Dialog, App Links, and Graph API"
 
   s.description  = <<-DESC
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = "7.0"
 
   s.source       = { :git => "https://github.com/facebook/facebook-ios-sdk.git",
-                     :tag => "sdk-version-4.27.0"
+                     :tag => "sdk-version-4.27.1"
                     }
 
   s.weak_frameworks = "Accounts", "CoreLocation", "Social", "Security", "QuartzCore", "CoreGraphics", "UIKit", "Foundation", "AudioToolbox"

diff --git a/FBSDKPlacesKit.podspec b/FBSDKPlacesKit.podspec
@@ -3,7 +3,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "FBSDKPlacesKit"
-  s.version      = "4.27.0"
+  s.version      = "4.27.1"
   s.summary      = "Official Facebook SDK for iOS to access Facebook Places"
 
   s.description  = <<-DESC
@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = "7.0"
 
   s.source       = { :git => "https://github.com/facebook/facebook-ios-sdk.git",
-                     :tag => "sdk-version-4.27.0"
+                     :tag => "sdk-version-4.27.1"
                     }
 
   s.weak_frameworks = "Accounts", "CoreLocation", "Social", "Security", "Foundation"

diff --git a/.../xcschemes/FBSDKLoginKit-Dynamic.xcscheme → ...xcschemes/FBSDKPlacesKit-Dynamic.xcscheme b/.../xcschemes/FBSDKLoginKit-Dynamic.xcscheme → ...xcschemes/FBSDKPlacesKit-Dynamic.xcscheme
diff --git a/...cschemes/FBSDKLoginKit-Universal.xcscheme → ...schemes/FBSDKPlacesKit-Universal.xcscheme b/...cschemes/FBSDKLoginKit-Universal.xcscheme → ...schemes/FBSDKPlacesKit-Universal.xcscheme
diff --git a/FBSDKPlacesKit/FBSDKPlacesKit/FBSDKPlacesManager.m b/FBSDKPlacesKit/FBSDKPlacesKit/FBSDKPlacesManager.m
@@ -200,7 +200,8 @@ - (FBSDKGraphRequest *)_currentPlaceGraphRequestForLocation:(CLLocation *)locati
   if (networkInfo) {
     NSString *ssid = networkInfo[@"SSID"];
     NSString *bssid = networkInfo[@"BSSID"];
-    if (ssid && bssid) {
+    if ((ssid && bssid) &&
+        !([ssid containsString:@"_nomap"] || [ssid containsString:@"_optout"])) {
       parameters[@"wifi"] = [self _jsonStringForObject:@{@"enabled" : @YES,
                                                          @"current_connection" : @{@"ssid" : ssid,
                                                                                    @"mac_address" : bssid}}];

diff --git a/FBSDKShareKit.podspec b/FBSDKShareKit.podspec
@@ -3,7 +3,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "FBSDKShareKit"
-  s.version      = "4.27.0"
+  s.version      = "4.27.1"
   s.summary      = "Official Facebook SDK for iOS to access Facebook Platform's Sharing Features"
 
   s.description  = <<-DESC
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target = '9.0'
 
   s.source       = { :git => "https://github.com/facebook/facebook-ios-sdk.git",
-                     :tag => "sdk-version-4.27.0"
+                     :tag => "sdk-version-4.27.1"
                     }
 
   s.ios.weak_frameworks = 'Accounts', 'AudioToolbox', 'CoreGraphics', 'CoreLocation', 'Foundation', 'QuartzCore', 'Security', 'Social', 'UIKit'

diff --git a/FBSDKShareKit/FBSDKShareKit/Internal/FBSDKGameRequestFrictionlessRecipientCache.m b/FBSDKShareKit/FBSDKShareKit/Internal/FBSDKGameRequestFrictionlessRecipientCache.m
@@ -83,6 +83,7 @@ - (void)_updateCache
 {
   if (![FBSDKAccessToken currentAccessToken]) {
     _recipientIDs = nil;
+    return;
   }
   FBSDKGraphRequest *request = [[FBSDKGraphRequest alloc] initWithGraphPath:@"me/apprequestformerrecipients"
                                                                  parameters:@{@"fields":@""}

diff --git a/FBSDKTVOSKit.podspec b/FBSDKTVOSKit.podspec
@@ -3,7 +3,7 @@
 Pod::Spec.new do |s|
 
   s.name         = 'FBSDKTVOSKit'
-  s.version      = '4.27.0'
+  s.version      = '4.27.1'
   s.summary      = 'Official Facebook SDK for tvOS to access Facebook Platform with features like Login and Graph API.'
 
   s.description  = <<-DESC
@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target = '9.0'
 
   s.source       = { :git => 'https://github.com/facebook/facebook-ios-sdk.git',
-                     :tag => 'sdk-version-4.27.0' }
+                     :tag => 'sdk-version-4.27.1' }
 
   s.source_files   = 'FBSDKTVOSKit/FBSDKTVOSKit/**/*.{h,m}'
   s.public_header_files = 'FBSDKTVOSKit/FBSDKTVOSKit/*.h'

diff --git a/scripts/build_distribution.sh b/scripts/build_distribution.sh
@@ -78,6 +78,15 @@ fi
 # Build FBAudienceNetwork framework
 #
 if [ "$PACKAGE" == "$PACAKAGE_AN" ]; then
+
+	# refuse to build with unclean state
+	repository_unclean=$(hg status -i ios-sdk/ | grep -v .DS_Store)
+	if [ "$repository_unclean" ]; then
+		echo "Detected unclean repository state:"
+		echo "$repository_unclean"
+		die "Please run 'hg purge --all' before building"
+	fi
+
 	AN_ZIP=$FB_AD_SDK_BUILD/$FB_AD_SDK_BINARY_NAME-$FB_AD_SDK_VERSION.zip
 	AN_BUILD_PACKAGE=$FB_AD_SDK_BUILD/package
 	AN_SAMPLES=$AN_BUILD_PACKAGE/Samples/FBAudienceNetwork
@@ -125,6 +134,7 @@ if [ "$PACKAGE" == "$PACAKAGE_AN" ]; then
 	done
 	for fname in $(find "$AN_SAMPLES" -name "*-PUBLIC.xcodeproj" -print); do \
 	  newfname="$(echo ${fname} | sed -e 's/-PUBLIC//')" ; \
+	    rm -rf "${newfname}"; \
 	    mv "${fname}" "${newfname}" ; \
 	done
 

diff --git a/vendor/OHHTTPStubs b/vendor/OHHTTPStubs