From 4fdd0f34cc483dca421d4a7488a919a445da93a4 Mon Sep 17 00:00:00 2001 From: Liming Xie Date: Thu, 17 Feb 2022 18:41:17 +0800 Subject: [PATCH] Update to work with iOS SDK v12.3.2 --- CHANGELOG.md | 3 +++ .../FacebookSDK/Plugins/Editor/Dependencies.xml | 10 +++++----- .../FacebookSDK/SDK/Editor/iOS/FBUnityInterface.mm | 13 +++++++++++-- .../FacebookSDK/SDK/Editor/iOS/FBUnitySDKDelegate.m | 12 ------------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e616deff5..53eb3a5f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +### Changed - 2022-02-17 +- Bumped native iOS SDK versions to 12.3.2 + ## [12.0.0] - 2021-12-09 ### Added diff --git a/UnitySDK/Assets/FacebookSDK/Plugins/Editor/Dependencies.xml b/UnitySDK/Assets/FacebookSDK/Plugins/Editor/Dependencies.xml index 1bead6e83..255974181 100644 --- a/UnitySDK/Assets/FacebookSDK/Plugins/Editor/Dependencies.xml +++ b/UnitySDK/Assets/FacebookSDK/Plugins/Editor/Dependencies.xml @@ -9,10 +9,10 @@ - - - - - + + + + + diff --git a/UnitySDK/Assets/FacebookSDK/SDK/Editor/iOS/FBUnityInterface.mm b/UnitySDK/Assets/FacebookSDK/SDK/Editor/iOS/FBUnityInterface.mm index b7c7f7be3..40fc621e9 100644 --- a/UnitySDK/Assets/FacebookSDK/SDK/Editor/iOS/FBUnityInterface.mm +++ b/UnitySDK/Assets/FacebookSDK/SDK/Editor/iOS/FBUnityInterface.mm @@ -637,7 +637,7 @@ void IOSFBAppEventsLogPurchase(double amount, void IOSFBAppEventsSetLimitEventUsage(BOOL limitEventUsage) { - [FBSDKSettings.sharedSettings setLimitEventAndDataUsage:limitEventUsage]; + [FBSDKSettings.sharedSettings setIsEventDataUsageLimited:limitEventUsage]; } void IOSFBAutoLogAppEventsEnabled(BOOL autoLogAppEventsEnabledID) @@ -652,7 +652,8 @@ void IOSFBAdvertiserIDCollectionEnabled(BOOL advertiserIDCollectionEnabledID) BOOL IOSFBAdvertiserTrackingEnabled(BOOL advertiserTrackingEnabled) { - return [FBSDKSettings.sharedSettings setAdvertiserTrackingEnabled:advertiserTrackingEnabled]; + [FBSDKSettings.sharedSettings setAdvertiserTrackingEnabled:advertiserTrackingEnabled]; + return advertiserTrackingEnabled; } char* IOSFBSdkVersion() @@ -833,6 +834,14 @@ void IOSFBUploadVideoToMediaLibrary(int requestId, return res; } + // referrenced in IOSWrapper.cs, [DllImport("__Internal")] + // either remove that or add a dummy function here to avoid link error + void IOSFBUpdateUserProperties(int numParams, + const char **paramKeys, + const char **paramVals) + { + } + void IOSFBFetchDeferredAppLink(int requestId) { [FBSDKAppLinkUtility fetchDeferredAppLink:^(NSURL *url, NSError *error) { diff --git a/UnitySDK/Assets/FacebookSDK/SDK/Editor/iOS/FBUnitySDKDelegate.m b/UnitySDK/Assets/FacebookSDK/SDK/Editor/iOS/FBUnitySDKDelegate.m index ac8d68532..b0943f9fb 100644 --- a/UnitySDK/Assets/FacebookSDK/SDK/Editor/iOS/FBUnitySDKDelegate.m +++ b/UnitySDK/Assets/FacebookSDK/SDK/Editor/iOS/FBUnitySDKDelegate.m @@ -117,10 +117,6 @@ - (void)contextDialogDidComplete:(id)contextDialog; { if ([contextDialog isKindOfClass:[FBSDKChooseContextDialog class]]) { [FBUnityUtility sendMessageToUnity: FBUnityMessageName_OnChooseGamingContextComplete userData: NULL requestId:_requestID]; - } else if ([contextDialog isKindOfClass:[FBSDKSwitchContextDialog class]]) { - [FBUnityUtility sendMessageToUnity: FBUnityMessageName_OnSwitchGamingContextComplete userData: NULL requestId:_requestID]; - } else if ([contextDialog isKindOfClass:[FBSDKCreateContextDialog class]]) { - [FBUnityUtility sendMessageToUnity: FBUnityMessageName_OnCreateGamingContextComplete userData: NULL requestId:_requestID]; } [self complete]; } @@ -129,10 +125,6 @@ - (void)contextDialog:(id)contextDialog didFailWithE { if ([contextDialog isKindOfClass:[FBSDKChooseContextDialog class]]) { [FBUnityUtility sendErrorToUnity:FBUnityMessageName_OnChooseGamingContextComplete error:error requestId:_requestID]; - } else if ([contextDialog isKindOfClass:[FBSDKSwitchContextDialog class]]) { - [FBUnityUtility sendErrorToUnity:FBUnityMessageName_OnSwitchGamingContextComplete error:error requestId:_requestID]; - } else if ([contextDialog isKindOfClass:[FBSDKCreateContextDialog class]]) { - [FBUnityUtility sendErrorToUnity:FBUnityMessageName_OnCreateGamingContextComplete error:error requestId:_requestID]; } [self complete]; } @@ -141,10 +133,6 @@ - (void)contextDialogDidCancel:(id)contextDialog { if ([contextDialog isKindOfClass:[FBSDKChooseContextDialog class]]) { [FBUnityUtility sendCancelToUnity:FBUnityMessageName_OnChooseGamingContextComplete requestId:_requestID]; - } else if ([contextDialog isKindOfClass:[FBSDKSwitchContextDialog class]]) { - [FBUnityUtility sendCancelToUnity:FBUnityMessageName_OnSwitchGamingContextComplete requestId:_requestID]; - } else if ([contextDialog isKindOfClass:[FBSDKCreateContextDialog class]]) { - [FBUnityUtility sendCancelToUnity:FBUnityMessageName_OnCreateGamingContextComplete requestId:_requestID]; } [self complete];