Additional bug fixes

al-af · al-af · commit 120070290cb0 · 2025-02-18T13:09:39.000+02:00
- iOS: Fixing a conflict with the 'SUCCESS' symbol declared in another third-party library. [Related to newArch and RN 0.76]
- iOS: Update import typo
- iOS: Fixing other booleans to pass by value and not by reference
diff --git a/demos/appsflyer-react-native-app/components/AppsFlyer.js b/demos/appsflyer-react-native-app/components/AppsFlyer.js
@@ -21,7 +21,12 @@ const initOptions = {
 export function AFInit() {
   if (Platform.OS == 'ios') {
     appsFlyer.setCurrentDeviceLanguage("EN");
+    appsFlyer.disableSKAD(true);
   }
+
+  appsFlyer.anonymizeUser(true);
+  appsFlyer.enableTCFDataCollection(true);
+
   appsFlyer.setAppInviteOneLinkID('oW4R');
   appsFlyer.initSdk(initOptions, null, null);
 }
diff --git a/ios/AppsFlyerLib.h b/ios/AppsFlyerLib.h
@@ -13,7 +13,7 @@
 #import <AppsFlyerLib/AppsFlyerDeepLinkResult.h>
 #import <AppsFlyerLib/AppsFlyerDeepLink.h>
 #import <AppsFlyerLib/AppsFlyerConsent.h>
-#import <AppsFlyerLib/AppsFlyerAdRevenueData.h>
+#import <AppsFlyerLib/AFAdRevenueData.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ios/RNAppsFlyer.h b/ios/RNAppsFlyer.h
@@ -27,7 +27,7 @@ static NSString *const NO_DEVKEY_FOUND              = @"No 'devKey' found or its
 static NSString *const NO_APPID_FOUND               = @"No 'appId' found or its empty";
 static NSString *const NO_EVENT_NAME_FOUND          = @"No 'eventName' found or its empty";
 static NSString *const EMPTY_OR_CORRUPTED_LIST      = @"No arguments found or list is corrupted";
-static NSString *const SUCCESS                      = @"Success";
+static NSString *const AF_SUCCESS                   = @"Success";
 static NSString *const INVALID_URI                  = @"Invalid URI";
 static NSString *const IOS_14_ONLY                  = @"Feature only supported on iOS 14 and above";
 
diff --git a/ios/RNAppsFlyer.m b/ios/RNAppsFlyer.m
@@ -14,7 +14,7 @@ @implementation RNAppsFlyer
     NSError* error = nil;
     error = [self callSdkInternal:initSdkOptions];
     if (error == nil){
-        successCallback(@[SUCCESS]);
+        successCallback(@[AF_SUCCESS]);
     }else{
         errorCallback(error);
     }
@@ -27,7 +27,7 @@ @implementation RNAppsFlyer
     NSError* error = nil;
     error = [self callSdkInternal:initSdkOptions];
     if (error == nil){
-        resolve(@[SUCCESS]);
+        resolve(@[AF_SUCCESS]);
     }else{
         reject([NSString stringWithFormat: @"%ld", (long)error.code], error.domain, error);    }
 }
@@ -141,7 +141,7 @@ -(NSError *) callSdkInternal:(NSDictionary*)initSdkOptions {
             errorCallback(@[error.localizedDescription]);
             return;
         }
-        successCallback(@[SUCCESS]);
+        successCallback(@[AF_SUCCESS]);
     }];
 }
 
@@ -159,7 +159,7 @@ -(NSError *) callSdkInternal:(NSDictionary*)initSdkOptions {
             reject([NSString stringWithFormat: @"%ld", (long)error.code], error.domain, error);
             return;
         }
-        resolve(@[SUCCESS]);
+        resolve(@[AF_SUCCESS]);
     }];
 }
 
@@ -238,18 +238,18 @@ -(NSError *) callSdkInternal:(NSDictionary*)initSdkOptions {
 
 RCT_EXPORT_METHOD(setCustomerUserId: (NSString *)userId callback:(RCTResponseSenderBlock)callback) {
     [[AppsFlyerLib shared] setCustomerUserID:userId];
-    callback(@[SUCCESS]);
+    callback(@[AF_SUCCESS]);
 }
 
 RCT_EXPORT_METHOD(stop: (BOOL)isStopped callback:(RCTResponseSenderBlock)callback) {
     [AppsFlyerLib shared].isStopped  = isStopped;
-     callback(@[SUCCESS]);
+     callback(@[AF_SUCCESS]);
 }
 
 RCT_EXPORT_METHOD(logLocation: (double)longitude latitude:(double)latitude callback:(RCTResponseSenderBlock)callback) {
     [[AppsFlyerLib shared] logLocation:longitude latitude:latitude];
     NSArray *events = @[[NSNumber numberWithDouble:longitude], [NSNumber numberWithDouble:latitude]];
-    callback(@[SUCCESS, events]);
+    callback(@[AF_SUCCESS, events]);
 }
 
 RCT_EXPORT_METHOD(setUserEmails: (NSDictionary*)options
@@ -288,7 +288,7 @@ -(NSError *) callSdkInternal:(NSDictionary*)initSdkOptions {
     }
     else{
         [[AppsFlyerLib shared] setUserEmails:emails withCryptType:emailsCryptType];
-        successCallback(@[SUCCESS]);
+        successCallback(@[AF_SUCCESS]);
     }
 }
 
@@ -301,19 +301,19 @@ -(void)sendLaunch:(UIApplication *)application {
 
 RCT_EXPORT_METHOD(setAdditionalData: (NSDictionary *)additionalData callback:(RCTResponseSenderBlock)callback) {
     [[AppsFlyerLib shared] setAdditionalData:additionalData];
-    callback(@[SUCCESS]);
+    callback(@[AF_SUCCESS]);
 }
 
 //USER INVITES
 
 RCT_EXPORT_METHOD(setAppInviteOneLinkID: (NSString *)oneLinkID callback:(RCTResponseSenderBlock)callback) {
     [AppsFlyerLib shared].appInviteOneLinkID = oneLinkID;
-    callback(@[SUCCESS]);
+    callback(@[AF_SUCCESS]);
 }
 
 RCT_EXPORT_METHOD(setCurrencyCode: (NSString *)currencyCode callback:(RCTResponseSenderBlock)callback) {
     [[AppsFlyerLib shared] setCurrencyCode:currencyCode];
-     callback(@[SUCCESS]);
+     callback(@[AF_SUCCESS]);
 }
 
 RCT_EXPORT_METHOD(generateInviteLink: (NSDictionary *)inviteLinkOptions
@@ -501,7 +501,7 @@ - (BOOL)isExpoApp {
 
 RCT_EXPORT_METHOD(anonymizeUser: (BOOL)b callback:(RCTResponseSenderBlock)callback) {
     [AppsFlyerLib shared].anonymizeUser = b;
-    callback(@[SUCCESS]);
+    callback(@[AF_SUCCESS]);
 }
 
 RCT_EXPORT_METHOD(updateServerUninstallToken: (NSString *)deviceToken callback:(RCTResponseSenderBlock)callback) {
@@ -517,21 +517,21 @@ - (BOOL)isExpoApp {
         [deviceTokenData appendBytes:&whole_byte length:1];
     }
     [[AppsFlyerLib shared] registerUninstall:deviceTokenData];
-    callback(@[SUCCESS]);
+    callback(@[AF_SUCCESS]);
 }
 
 RCT_EXPORT_METHOD(setOneLinkCustomDomains:(NSArray *) domains
                   successCallback :(RCTResponseSenderBlock)successCallback
                   errorCallback:(RCTResponseErrorBlock)errorCallback) {
     [[AppsFlyerLib shared] setOneLinkCustomDomains:domains];
-    successCallback(@[SUCCESS]);
+    successCallback(@[AF_SUCCESS]);
 }
 
 RCT_EXPORT_METHOD(setResolveDeepLinkURLs:(NSArray *) urls
                   successCallback :(RCTResponseSenderBlock)successCallback
                   errorCallback:(RCTResponseErrorBlock)errorCallback) {
     [[AppsFlyerLib shared] setResolveDeepLinkURLs:urls];
-    successCallback(@[SUCCESS]);
+    successCallback(@[AF_SUCCESS]);
 }
 
 RCT_EXPORT_METHOD(performOnAppAttribution:(NSString *) urlString
@@ -543,7 +543,7 @@ - (BOOL)isExpoApp {
         errorCallback(error);
     } else {
         [[AppsFlyerLib shared] performOnAppAttributionWithURL:url];
-        successCallback(@[SUCCESS]);
+        successCallback(@[AF_SUCCESS]);
     }
 }
 
@@ -606,16 +606,16 @@ - (BOOL)isExpoApp {
 
 RCT_EXPORT_METHOD(setHost: (NSString*)hostPrefix hostName: (NSString*)hostName successCallback :(RCTResponseSenderBlock)successCallback) {
     [[AppsFlyerLib shared] setHost:hostName withHostPrefix:hostPrefix];
-    successCallback(@[SUCCESS]);
+    successCallback(@[AF_SUCCESS]);
 }
 
 RCT_EXPORT_METHOD(addPushNotificationDeepLinkPath: (NSArray*)path successCallback :(RCTResponseSenderBlock)successCallback
                   errorCallback:(RCTResponseErrorBlock)errorCallback) {
     [[AppsFlyerLib shared] addPushNotificationDeepLinkPath: path];
-    successCallback(@[SUCCESS]);
+    successCallback(@[AF_SUCCESS]);
 }
 
-RCT_EXPORT_METHOD(disableSKAD: (BOOL *)b ) {
+RCT_EXPORT_METHOD(disableSKAD: (BOOL)b ) {
     [AppsFlyerLib shared].disableSKAdNetwork = b;
     if (b){
         NSLog(@"[DEBUG] AppsFlyer: SKADNetwork is disabled");
@@ -636,7 +636,7 @@ - (BOOL)isExpoApp {
     [[AppsFlyerLib shared] appendParametersToDeepLinkingURLWithString:contains parameters:parameters];
 }
 
-RCT_EXPORT_METHOD(enableTCFDataCollection:(BOOL *)enabled) {
+RCT_EXPORT_METHOD(enableTCFDataCollection:(BOOL)enabled) {
     [[AppsFlyerLib shared] enableTCFDataCollection:enabled];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,12 @@ const initOptions = {`
`21`	`21`	`export function AFInit() {`
`22`	`22`	`if (Platform.OS == 'ios') {`
`23`	`23`	`appsFlyer.setCurrentDeviceLanguage("EN");`
	`24`	`+ appsFlyer.disableSKAD(true);`
`24`	`25`	`}`
	`26`	`+`
	`27`	`+ appsFlyer.anonymizeUser(true);`
	`28`	`+ appsFlyer.enableTCFDataCollection(true);`
	`29`	`+`
`25`	`30`	`appsFlyer.setAppInviteOneLinkID('oW4R');`
`26`	`31`	`appsFlyer.initSdk(initOptions, null, null);`
`27`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ @implementation RNAppsFlyer`
`14`	`14`	`NSError* error = nil;`
`15`	`15`	`error = [self callSdkInternal:initSdkOptions];`
`16`	`16`	`if (error == nil){`
`17`		`- successCallback(@[SUCCESS]);`
	`17`	`+ successCallback(@[AF_SUCCESS]);`
`18`	`18`	`}else{`
`19`	`19`	`errorCallback(error);`
`20`	`20`	`}`
`@@ -27,7 +27,7 @@ @implementation RNAppsFlyer`
`27`	`27`	`NSError* error = nil;`
`28`	`28`	`error = [self callSdkInternal:initSdkOptions];`
`29`	`29`	`if (error == nil){`
`30`		`- resolve(@[SUCCESS]);`
	`30`	`+ resolve(@[AF_SUCCESS]);`
`31`	`31`	`}else{`
`32`	`32`	`reject([NSString stringWithFormat: @"%ld", (long)error.code], error.domain, error); }`
`33`	`33`	`}`
`@@ -141,7 +141,7 @@ -(NSError ) callSdkInternal:(NSDictionary)initSdkOptions {`
`141`	`141`	`errorCallback(@[error.localizedDescription]);`
`142`	`142`	`return;`
`143`	`143`	`}`
`144`		`- successCallback(@[SUCCESS]);`
	`144`	`+ successCallback(@[AF_SUCCESS]);`
`145`	`145`	`}];`
`146`	`146`	`}`
`147`	`147`
`@@ -159,7 +159,7 @@ -(NSError ) callSdkInternal:(NSDictionary)initSdkOptions {`
`159`	`159`	`reject([NSString stringWithFormat: @"%ld", (long)error.code], error.domain, error);`
`160`	`160`	`return;`
`161`	`161`	`}`
`162`		`- resolve(@[SUCCESS]);`
	`162`	`+ resolve(@[AF_SUCCESS]);`
`163`	`163`	`}];`
`164`	`164`	`}`
`165`	`165`
`@@ -238,18 +238,18 @@ -(NSError ) callSdkInternal:(NSDictionary)initSdkOptions {`
`238`	`238`
`239`	`239`	`RCT_EXPORT_METHOD(setCustomerUserId: (NSString *)userId callback:(RCTResponseSenderBlock)callback) {`
`240`	`240`	`[[AppsFlyerLib shared] setCustomerUserID:userId];`
`241`		`- callback(@[SUCCESS]);`
	`241`	`+ callback(@[AF_SUCCESS]);`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`RCT_EXPORT_METHOD(stop: (BOOL)isStopped callback:(RCTResponseSenderBlock)callback) {`
`245`	`245`	`[AppsFlyerLib shared].isStopped = isStopped;`
`246`		`- callback(@[SUCCESS]);`
	`246`	`+ callback(@[AF_SUCCESS]);`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`RCT_EXPORT_METHOD(logLocation: (double)longitude latitude:(double)latitude callback:(RCTResponseSenderBlock)callback) {`
`250`	`250`	`[[AppsFlyerLib shared] logLocation:longitude latitude:latitude];`
`251`	`251`	`NSArray *events = @[[NSNumber numberWithDouble:longitude], [NSNumber numberWithDouble:latitude]];`
`252`		`- callback(@[SUCCESS, events]);`
	`252`	`+ callback(@[AF_SUCCESS, events]);`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`RCT_EXPORT_METHOD(setUserEmails: (NSDictionary*)options`
`@@ -288,7 +288,7 @@ -(NSError ) callSdkInternal:(NSDictionary)initSdkOptions {`
`288`	`288`	`}`
`289`	`289`	`else{`
`290`	`290`	`[[AppsFlyerLib shared] setUserEmails:emails withCryptType:emailsCryptType];`
`291`		`- successCallback(@[SUCCESS]);`
	`291`	`+ successCallback(@[AF_SUCCESS]);`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`
`@@ -301,19 +301,19 @@ -(void)sendLaunch:(UIApplication *)application {`
`301`	`301`
`302`	`302`	`RCT_EXPORT_METHOD(setAdditionalData: (NSDictionary *)additionalData callback:(RCTResponseSenderBlock)callback) {`
`303`	`303`	`[[AppsFlyerLib shared] setAdditionalData:additionalData];`
`304`		`- callback(@[SUCCESS]);`
	`304`	`+ callback(@[AF_SUCCESS]);`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`//USER INVITES`
`308`	`308`
`309`	`309`	`RCT_EXPORT_METHOD(setAppInviteOneLinkID: (NSString *)oneLinkID callback:(RCTResponseSenderBlock)callback) {`
`310`	`310`	`[AppsFlyerLib shared].appInviteOneLinkID = oneLinkID;`
`311`		`- callback(@[SUCCESS]);`
	`311`	`+ callback(@[AF_SUCCESS]);`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`RCT_EXPORT_METHOD(setCurrencyCode: (NSString *)currencyCode callback:(RCTResponseSenderBlock)callback) {`
`315`	`315`	`[[AppsFlyerLib shared] setCurrencyCode:currencyCode];`
`316`		`- callback(@[SUCCESS]);`
	`316`	`+ callback(@[AF_SUCCESS]);`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`RCT_EXPORT_METHOD(generateInviteLink: (NSDictionary *)inviteLinkOptions`
`@@ -501,7 +501,7 @@ - (BOOL)isExpoApp {`
`501`	`501`
`502`	`502`	`RCT_EXPORT_METHOD(anonymizeUser: (BOOL)b callback:(RCTResponseSenderBlock)callback) {`
`503`	`503`	`[AppsFlyerLib shared].anonymizeUser = b;`
`504`		`- callback(@[SUCCESS]);`
	`504`	`+ callback(@[AF_SUCCESS]);`
`505`	`505`	`}`
`506`	`506`
`507`	`507`	`RCT_EXPORT_METHOD(updateServerUninstallToken: (NSString *)deviceToken callback:(RCTResponseSenderBlock)callback) {`
`@@ -517,21 +517,21 @@ - (BOOL)isExpoApp {`
`517`	`517`	`[deviceTokenData appendBytes:&whole_byte length:1];`
`518`	`518`	`}`
`519`	`519`	`[[AppsFlyerLib shared] registerUninstall:deviceTokenData];`
`520`		`- callback(@[SUCCESS]);`
	`520`	`+ callback(@[AF_SUCCESS]);`
`521`	`521`	`}`
`522`	`522`
`523`	`523`	`RCT_EXPORT_METHOD(setOneLinkCustomDomains:(NSArray *) domains`
`524`	`524`	`successCallback :(RCTResponseSenderBlock)successCallback`
`525`	`525`	`errorCallback:(RCTResponseErrorBlock)errorCallback) {`
`526`	`526`	`[[AppsFlyerLib shared] setOneLinkCustomDomains:domains];`
`527`		`- successCallback(@[SUCCESS]);`
	`527`	`+ successCallback(@[AF_SUCCESS]);`
`528`	`528`	`}`
`529`	`529`
`530`	`530`	`RCT_EXPORT_METHOD(setResolveDeepLinkURLs:(NSArray *) urls`
`531`	`531`	`successCallback :(RCTResponseSenderBlock)successCallback`
`532`	`532`	`errorCallback:(RCTResponseErrorBlock)errorCallback) {`
`533`	`533`	`[[AppsFlyerLib shared] setResolveDeepLinkURLs:urls];`
`534`		`- successCallback(@[SUCCESS]);`
	`534`	`+ successCallback(@[AF_SUCCESS]);`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`RCT_EXPORT_METHOD(performOnAppAttribution:(NSString *) urlString`
`@@ -543,7 +543,7 @@ - (BOOL)isExpoApp {`
`543`	`543`	`errorCallback(error);`
`544`	`544`	`} else {`
`545`	`545`	`[[AppsFlyerLib shared] performOnAppAttributionWithURL:url];`
`546`		`- successCallback(@[SUCCESS]);`
	`546`	`+ successCallback(@[AF_SUCCESS]);`
`547`	`547`	`}`
`548`	`548`	`}`
`549`	`549`
`@@ -606,16 +606,16 @@ - (BOOL)isExpoApp {`
`606`	`606`
`607`	`607`	`RCT_EXPORT_METHOD(setHost: (NSString)hostPrefix hostName: (NSString)hostName successCallback :(RCTResponseSenderBlock)successCallback) {`
`608`	`608`	`[[AppsFlyerLib shared] setHost:hostName withHostPrefix:hostPrefix];`
`609`		`- successCallback(@[SUCCESS]);`
	`609`	`+ successCallback(@[AF_SUCCESS]);`
`610`	`610`	`}`
`611`	`611`
`612`	`612`	`RCT_EXPORT_METHOD(addPushNotificationDeepLinkPath: (NSArray*)path successCallback :(RCTResponseSenderBlock)successCallback`
`613`	`613`	`errorCallback:(RCTResponseErrorBlock)errorCallback) {`
`614`	`614`	`[[AppsFlyerLib shared] addPushNotificationDeepLinkPath: path];`
`615`		`- successCallback(@[SUCCESS]);`
	`615`	`+ successCallback(@[AF_SUCCESS]);`
`616`	`616`	`}`
`617`	`617`
`618`		`-RCT_EXPORT_METHOD(disableSKAD: (BOOL *)b ) {`
	`618`	`+RCT_EXPORT_METHOD(disableSKAD: (BOOL)b ) {`
`619`	`619`	`[AppsFlyerLib shared].disableSKAdNetwork = b;`
`620`	`620`	`if (b){`
`621`	`621`	`NSLog(@"[DEBUG] AppsFlyer: SKADNetwork is disabled");`
`@@ -636,7 +636,7 @@ - (BOOL)isExpoApp {`
`636`	`636`	`[[AppsFlyerLib shared] appendParametersToDeepLinkingURLWithString:contains parameters:parameters];`
`637`	`637`	`}`
`638`	`638`
`639`		`-RCT_EXPORT_METHOD(enableTCFDataCollection:(BOOL *)enabled) {`
	`639`	`+RCT_EXPORT_METHOD(enableTCFDataCollection:(BOOL)enabled) {`
`640`	`640`	`[[AppsFlyerLib shared] enableTCFDataCollection:enabled];`
`641`	`641`	`}`
`642`	`642`