From a69c72f813bf349f474b7543662dcda023d8ef84 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Mon, 12 Aug 2024 20:26:15 +0300 Subject: [PATCH 01/45] add some attempt of adding the adrevenue api --- plugin.xml | 2 +- .../cordova/plugin/AppsFlyerConstants.java | 2 +- .../cordova/plugin/AppsFlyerPlugin.java | 44 +++++++++++++++ src/android/cordovaAF.gradle | 2 +- src/ios/AppsFlyerPlugin.h | 1 + src/ios/AppsFlyerPlugin.m | 46 +++++++++++++++- www/appsflyer.js | 54 +++++++++++++++++++ 7 files changed, 147 insertions(+), 4 deletions(-) diff --git a/plugin.xml b/plugin.xml index 054aa3a6..c55bd3d1 100644 --- a/plugin.xml +++ b/plugin.xml @@ -91,7 +91,7 @@ - + diff --git a/src/android/com/appsflyer/cordova/plugin/AppsFlyerConstants.java b/src/android/com/appsflyer/cordova/plugin/AppsFlyerConstants.java index 0cd7b5e3..f5bdc93c 100644 --- a/src/android/com/appsflyer/cordova/plugin/AppsFlyerConstants.java +++ b/src/android/com/appsflyer/cordova/plugin/AppsFlyerConstants.java @@ -6,7 +6,7 @@ public class AppsFlyerConstants { - final static String PLUGIN_VERSION = "6.14.0"; + final static String PLUGIN_VERSION = "6.15.0"; final static String NO_DEVKEY_FOUND = "AppsFlyer 'devKey' is missing or empty"; final static String NO_GCM_PROJECT_NUMBER_PROVIDED = "No GCM Project number provided"; final static String SUCCESS = "Success"; diff --git a/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java b/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java index e37358d0..2a6f95f9 100644 --- a/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java +++ b/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java @@ -176,10 +176,54 @@ public boolean execute(final String action, JSONArray args, CallbackContext call return setConsentData(args); } else if ("enableTCFDataCollection".equals(action)) { return enableTCFDataCollection(args); + } else if ("logAdRevenue".equals(action)) { + return logAdRevenue(args); } return false; } + /** + * log AdRevenue event + * + * @param args - event params + * @return true + */ + private boolean logAdRevenue(JSONArray args) { + cordova.getThreadPool().execute(() -> { + Map additionalParameters = null; + try { + JSONObject afAdRevenueDataJsonObj = args.getJSONObject(0); + String monetizationNetwork = afAdRevenueDataJsonObj.optString("monetizationNetwork", null); + String mediationNetwork = afAdRevenueDataJsonObj.optString("mediationNetwork", null); + String currencyIso4217Code = afAdRevenueDataJsonObj.optString("currencyIso4217Code", null); + double revenue = afAdRevenueDataJsonObj.optDouble("revenue", -1); + + if(args.get(1) != null){ + JSONObject additionalParametersJson = args.getJSONObject(1); + additionalParameters = toObjectMap(additionalParametersJson); + } + + if(mediationNetwork != null){ + MediationNetwork mediationNetworkEnumVal = null; + for(MediationNetwork mediationNetworkEnum: MediationNetwork.values()){ + if(mediationNetworkEnum.name().equals(mediationNetwork)){ + mediationNetworkEnumVal = MediationNetwork.valueOf(mediationNetwork); + } + } + if(mediationNetworkEnumVal != null){ + AFAdRevenueData afAdRevenueData = new AFAdRevenueData(monetizationNetwork, mediationNetworkEnumVal, currencyIso4217Code, revenue); + AppsFlyerLib.getInstance().logAdRevenue(afAdRevenueData, additionalParameters); + } + } + + } catch (JSONException e) { + e.printStackTrace(); + } + }); + return true; + } + + /** * set consent data according to GDPR if applies or not. * diff --git a/src/android/cordovaAF.gradle b/src/android/cordovaAF.gradle index 70d1d051..011933b3 100644 --- a/src/android/cordovaAF.gradle +++ b/src/android/cordovaAF.gradle @@ -4,7 +4,7 @@ repositories { dependencies { implementation 'com.android.installreferrer:installreferrer:2.1' - implementation 'com.appsflyer:af-android-sdk:6.14.0@aar' + implementation 'com.appsflyer:af-android-sdk:6.15.0@aar' implementation 'com.android.support:support-annotations:28.0.0' implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.6.20' } diff --git a/src/ios/AppsFlyerPlugin.h b/src/ios/AppsFlyerPlugin.h index 5eb390a2..dc708fe7 100755 --- a/src/ios/AppsFlyerPlugin.h +++ b/src/ios/AppsFlyerPlugin.h @@ -33,6 +33,7 @@ - (void)setCurrentDeviceLanguage:(CDVInvokedUrlCommand*)command; - (void)setAdditionalData:(CDVInvokedUrlCommand*)command; - (void)setConsentData:(CDVInvokedUrlCommand*)command; +- (void)logAdRevenue:(CDVInvokedUrlCommand*)command; - (void)enableTCFDataCollection:(CDVInvokedUrlCommand*)command; - (void)setSharingFilter:(CDVInvokedUrlCommand*)command __attribute__((deprecated)); - (void)setSharingFilterForAllPartners:(CDVInvokedUrlCommand*)command __attribute__((deprecated)); diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m index f88ba119..f0879268 100755 --- a/src/ios/AppsFlyerPlugin.m +++ b/src/ios/AppsFlyerPlugin.m @@ -96,7 +96,7 @@ - (void)initSdk:(CDVInvokedUrlCommand*)command } // Initialize the SDK - [[AppsFlyerLib shared] setPluginInfoWith:AFSDKPluginCordova pluginVersion:@"6.14.3" additionalParams:nil]; + [[AppsFlyerLib shared] setPluginInfoWith:AFSDKPluginCordova pluginVersion:@"6.15.0" additionalParams:nil]; [AppsFlyerLib shared].appleAppID = appId; [AppsFlyerLib shared].appsFlyerDevKey = devKey; [AppsFlyerLib shared].isDebug = isDebug; @@ -196,6 +196,50 @@ - (void)setCurrencyCode:(CDVInvokedUrlCommand*)command [AppsFlyerLib shared].currencyCode = currencyId; } +/** +* log AdRevenue event +*/ +- (void)logAdRevenue:(CDVInvokedUrlCommand*)command +{ + if ([command.arguments count] == 0) { + return; + } + NSDictionary *afAdRevenueDataMap = (NSDictionary*)[command.arguments objectAtIndex: 0]; + + id monetizationNetwork = nil; + id mediationNetwork = nil; + id currencyIso4217Code = nil; + id revenue = -1; + + id monetizationNetworkValue = nil; + id mediationNetworkValue = nil; + id currencyIso4217CodeValue = nil; + id revenueValue = -1; + + monetizationNetworkValue = [afAdRevenueDataMap objectForKey:@"monetizationNetwork"]; + if ([monetizationNetworkValue isKindOfClass:[NSString class]]) { + monetizationNetwork = monetizationNetworkValue; + } + + mediationNetworkValue = [afAdRevenueDataMap objectForKey:@"mediationNetwork"]; + if ([mediationNetworkValue isKindOfClass:[NSString class]]) { + hasConsentForDataUsage = [(NSNumber*)hasConsentForDataUsageValue boolValue]; + } + + hasConsentForAdsPersonalizationValue = [consentDataMap objectForKey:@"hasConsentForAdsPersonalization"]; + if ([hasConsentForAdsPersonalizationValue isKindOfClass:[NSNumber class]]) { + hasConsentForAdsPersonalization = [(NSNumber*)hasConsentForAdsPersonalizationValue boolValue]; + } + + AppsFlyerConsent *consentData = nil; + if (isUserSubjectToGDPR) { + consentData = [[AppsFlyerConsent alloc] initForGDPRUserWithHasConsentForDataUsage:hasConsentForDataUsage hasConsentForAdsPersonalization:hasConsentForAdsPersonalization]; + } else { + consentData = [[AppsFlyerConsent alloc] initNonGDPRUser]; + } + [[AppsFlyerLib shared] setConsentData:consentData]; +} + /** * Sets new currency code. currencyId: ISO 4217 Currency Codes. */ diff --git a/www/appsflyer.js b/www/appsflyer.js index 2d6fe85b..44aba574 100644 --- a/www/appsflyer.js +++ b/www/appsflyer.js @@ -3,6 +3,8 @@ var exec = require('cordova/exec'), AppsFlyerError = require('./AppsFlyerError'); var callbackMap = {}; +let AFAdRevenueData; + if (!window.CustomEvent) { window.CustomEvent = function (type, config) { var e = document.createEvent('CustomEvent'); @@ -37,6 +39,45 @@ if (!window.CustomEvent) { }; })(); + // AFAdRevenueData object with MediationNetwork enum + global.AFAdRevenueData = (function() { + const MediationNetwork = { + IRONSOURCE:"ironsource", + APPLOVIN_MAX:"applovinmax", + GOOGLE_ADMOB:"googleadmob", + FYBER:"fyber", + APPODEAL:"appodeal", + ADMOST:"Admost", + TOPON:"Topon", + TRADPLUS:"Tradplus", + YANDEX:"Yandex", + CHARTBOOST:"chartboost", + UNITY:"Unity", + TOPON_PTE:"toponpte", + CUSTOM_MEDIATION:"customMediation", + DIRECT_MONETIZATION_NETWORK:"directMonetizationNetwork" + }; + + function AFAdRevenueData(monetizationNetwork, mediationNetwork, currencyIso4217Code, revenue) { + if (!Object.values(MediationNetwork).includes(mediationNetwork)) { + throw new Error("Invalid enum value for 'mediationNetwork'."); + } + this.monetizationNetwork = monetizationNetwork; + this.mediationNetwork = mediationNetwork; + this.currencyIso4217Code = currencyIso4217Code; + this.revenue = revenue; + } + + return AFAdRevenueData; // Expose the constructor directly + })(); + + function validateAFAdRevenueData(afAdRevenueData) { + if (!(afAdRevenueData instanceof AFAdRevenueData)) { + throw new Error("Invalid AFAdRevenueData object."); + } + return afAdRevenueData; + } + /** * initialize the SDK. * args: SDK configuration @@ -109,6 +150,19 @@ if (!window.CustomEvent) { exec(null, null, 'AppsFlyerPlugin', 'setCurrencyCode', [currencyId]); }; + /** + * Public API - logAdRevenue function + */ + AppsFlyer.prototype.logAdRevenue = function(afAdRevenueData, additionalParameters) { + argscheck.checkArgs('S', 'AppsFlyer.logAdRevenue', arguments); + + // Validate AFAdRevenueData before logging + const validatedAfAdRevenueData = validateAFAdRevenueData(afAdRevenueData); + + // Call the 'logAdRevenue' API method with the validated data + exec(null, null, 'AppsFlyerPlugin', 'logAdRevenue', [validatedAfAdRevenueData, additionalParameters]); + }; + /** * Setting your own Custom ID enables you to cross-reference your own unique ID with AppsFlyer’s user ID and the other devices’ IDs. */ From b55d63b3268546b4e0b89b407f5121bb1f4ac5f3 Mon Sep 17 00:00:00 2001 From: pazlavi Date: Mon, 12 Aug 2024 17:26:45 +0000 Subject: [PATCH 02/45] update plugin.xml and package.json files --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2b7d693f..35f0d1d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-plugin-appsflyer-sdk", - "version": "6.14.3", + "version": "6.15.0-rc1", "description": "Cordova AppsFlyer SDK Plugin", "cordova": { "id": "cordova-plugin-appsflyer-sdk", From 2ac18d4fdab5dc2e1d2114778766107b068ccc17 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Wed, 14 Aug 2024 12:52:27 +0300 Subject: [PATCH 03/45] rm constructor - move the validation to native part, add enum class --- www/AppsFlyerError.js | 2 -- www/MediationNetwork.js | 16 ++++++++++++++ www/appsflyer.js | 47 +---------------------------------------- 3 files changed, 17 insertions(+), 48 deletions(-) create mode 100644 www/MediationNetwork.js diff --git a/www/AppsFlyerError.js b/www/AppsFlyerError.js index 9f832e12..d0a1716a 100644 --- a/www/AppsFlyerError.js +++ b/www/AppsFlyerError.js @@ -1,5 +1,3 @@ - - module.exports = Object.freeze({ INVALID_ARGUMENT_ERROR: "INVALID ARGUMENT ERROR", NO_DEVKEY_FOUND: "AppsFlyer 'devKey' is missing or empty", diff --git a/www/MediationNetwork.js b/www/MediationNetwork.js new file mode 100644 index 00000000..af9b0aeb --- /dev/null +++ b/www/MediationNetwork.js @@ -0,0 +1,16 @@ +module.exports = Object.freeze({ + IRONSOURCE:"ironsource", + APPLOVIN_MAX:"applovinmax", + GOOGLE_ADMOB:"googleadmob", + FYBER:"fyber", + APPODEAL:"appodeal", + ADMOST:"Admost", + TOPON:"Topon", + TRADPLUS:"Tradplus", + YANDEX:"Yandex", + CHARTBOOST:"chartboost", + UNITY:"Unity", + TOPON_PTE:"toponpte", + CUSTOM_MEDIATION:"customMediation", + DIRECT_MONETIZATION_NETWORK:"directMonetizationNetwork" +}); \ No newline at end of file diff --git a/www/appsflyer.js b/www/appsflyer.js index 44aba574..ae24fac9 100644 --- a/www/appsflyer.js +++ b/www/appsflyer.js @@ -3,8 +3,6 @@ var exec = require('cordova/exec'), AppsFlyerError = require('./AppsFlyerError'); var callbackMap = {}; -let AFAdRevenueData; - if (!window.CustomEvent) { window.CustomEvent = function (type, config) { var e = document.createEvent('CustomEvent'); @@ -39,44 +37,6 @@ if (!window.CustomEvent) { }; })(); - // AFAdRevenueData object with MediationNetwork enum - global.AFAdRevenueData = (function() { - const MediationNetwork = { - IRONSOURCE:"ironsource", - APPLOVIN_MAX:"applovinmax", - GOOGLE_ADMOB:"googleadmob", - FYBER:"fyber", - APPODEAL:"appodeal", - ADMOST:"Admost", - TOPON:"Topon", - TRADPLUS:"Tradplus", - YANDEX:"Yandex", - CHARTBOOST:"chartboost", - UNITY:"Unity", - TOPON_PTE:"toponpte", - CUSTOM_MEDIATION:"customMediation", - DIRECT_MONETIZATION_NETWORK:"directMonetizationNetwork" - }; - - function AFAdRevenueData(monetizationNetwork, mediationNetwork, currencyIso4217Code, revenue) { - if (!Object.values(MediationNetwork).includes(mediationNetwork)) { - throw new Error("Invalid enum value for 'mediationNetwork'."); - } - this.monetizationNetwork = monetizationNetwork; - this.mediationNetwork = mediationNetwork; - this.currencyIso4217Code = currencyIso4217Code; - this.revenue = revenue; - } - - return AFAdRevenueData; // Expose the constructor directly - })(); - - function validateAFAdRevenueData(afAdRevenueData) { - if (!(afAdRevenueData instanceof AFAdRevenueData)) { - throw new Error("Invalid AFAdRevenueData object."); - } - return afAdRevenueData; - } /** * initialize the SDK. @@ -155,12 +115,7 @@ if (!window.CustomEvent) { */ AppsFlyer.prototype.logAdRevenue = function(afAdRevenueData, additionalParameters) { argscheck.checkArgs('S', 'AppsFlyer.logAdRevenue', arguments); - - // Validate AFAdRevenueData before logging - const validatedAfAdRevenueData = validateAFAdRevenueData(afAdRevenueData); - - // Call the 'logAdRevenue' API method with the validated data - exec(null, null, 'AppsFlyerPlugin', 'logAdRevenue', [validatedAfAdRevenueData, additionalParameters]); + exec(null, null, 'AppsFlyerPlugin', 'logAdRevenue', [afAdRevenueData, additionalParameters]); }; /** From 9c1e4062be0af34ffb76d7fa8ae1324def014dda Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Wed, 14 Aug 2024 16:19:13 +0300 Subject: [PATCH 04/45] add adrevenue api --- .../cordova/plugin/AppsFlyerPlugin.java | 40 ++++++++------- src/ios/AppsFlyerPlugin.m | 51 +++++++++++++++---- 2 files changed, 64 insertions(+), 27 deletions(-) diff --git a/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java b/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java index 2a6f95f9..46b3c28a 100644 --- a/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java +++ b/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java @@ -62,6 +62,8 @@ import com.appsflyer.internal.platform_extension.Plugin; import com.appsflyer.internal.platform_extension.PluginInfo; import com.appsflyer.AppsFlyerConsent; +import com.appsflyer.MediationNetwork; +import com.appsflyer.AFAdRevenueData; import org.apache.cordova.CallbackContext; import org.apache.cordova.CordovaInterface; @@ -190,38 +192,42 @@ public boolean execute(final String action, JSONArray args, CallbackContext call */ private boolean logAdRevenue(JSONArray args) { cordova.getThreadPool().execute(() -> { - Map additionalParameters = null; + Map additionalParameters = null; try { - JSONObject afAdRevenueDataJsonObj = args.getJSONObject(0); - String monetizationNetwork = afAdRevenueDataJsonObj.optString("monetizationNetwork", null); - String mediationNetwork = afAdRevenueDataJsonObj.optString("mediationNetwork", null); - String currencyIso4217Code = afAdRevenueDataJsonObj.optString("currencyIso4217Code", null); - double revenue = afAdRevenueDataJsonObj.optDouble("revenue", -1); - - if(args.get(1) != null){ - JSONObject additionalParametersJson = args.getJSONObject(1); - additionalParameters = toObjectMap(additionalParametersJson); - } - - if(mediationNetwork != null){ + if(args.get(0) != null){ + JSONObject afAdRevenueDataJsonObj = args.getJSONObject(0); + String monetizationNetwork = afAdRevenueDataJsonObj.optString("monetizationNetwork", null); + String mediationNetwork = afAdRevenueDataJsonObj.optString("mediationNetwork", null); + String currencyIso4217Code = afAdRevenueDataJsonObj.optString("currencyIso4217Code", null); + double revenue = afAdRevenueDataJsonObj.optDouble("revenue", -1); MediationNetwork mediationNetworkEnumVal = null; - for(MediationNetwork mediationNetworkEnum: MediationNetwork.values()){ - if(mediationNetworkEnum.name().equals(mediationNetwork)){ - mediationNetworkEnumVal = MediationNetwork.valueOf(mediationNetwork); + + if(mediationNetwork != null){ + for(MediationNetwork mediationNetworkEnum: MediationNetwork.values()){ + if(mediationNetworkEnum.name().equals(mediationNetwork)){ + mediationNetworkEnumVal = MediationNetwork.valueOf(mediationNetwork); + continue; + } } } + + if(args.get(1) != null){ + JSONObject additionalParametersJson = args.getJSONObject(1); + additionalParameters = toObjectMap(additionalParametersJson); + } + if(mediationNetworkEnumVal != null){ AFAdRevenueData afAdRevenueData = new AFAdRevenueData(monetizationNetwork, mediationNetworkEnumVal, currencyIso4217Code, revenue); AppsFlyerLib.getInstance().logAdRevenue(afAdRevenueData, additionalParameters); } } - } catch (JSONException e) { e.printStackTrace(); } }); return true; } + } /** diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m index f0879268..ffe3b8d5 100755 --- a/src/ios/AppsFlyerPlugin.m +++ b/src/ios/AppsFlyerPlugin.m @@ -196,6 +196,33 @@ - (void)setCurrencyCode:(CDVInvokedUrlCommand*)command [AppsFlyerLib shared].currencyCode = currencyId; } + +- (AppsFlyerAdRevenueMediationNetworkType)getEnumValueFromString:(NSString *)mediationNetworkString { + NSDictionary *stringToEnumMap = @{ + @"googleadmob": @(AppsFlyerAdRevenueMediationNetworkTypeGoogleAdMob), + @"ironsource": @(AppsFlyerAdRevenueMediationNetworkTypeIronSource), + @"applovinmax": @(AppsFlyerAdRevenueMediationNetworkTypeApplovinMax), + @"fyber": @(AppsFlyerAdRevenueMediationNetworkTypeFyber), + @"appodeal": @(AppsFlyerAdRevenueMediationNetworkTypeAppodeal), + @"Admost": @(AppsFlyerAdRevenueMediationNetworkTypeAdmost), + @"Topon": @(AppsFlyerAdRevenueMediationNetworkTypeTopon), + @"Tradplus": @(AppsFlyerAdRevenueMediationNetworkTypeTradplus), + @"Yandex": @(AppsFlyerAdRevenueMediationNetworkTypeYandex), + @"Saturchartboostday": @(AppsFlyerAdRevenueMediationNetworkTypeChartBoost), + @"Unity": @(AppsFlyerAdRevenueMediationNetworkTypeUnity), + @"toponpte": @(AppsFlyerAdRevenueMediationNetworkTypeToponPte), + @"customMediation": @(AppsFlyerAdRevenueMediationNetworkTypeCustom), + @"directMonetizationNetwork": @(AppsFlyerAdRevenueMediationNetworkTypeDirectMonetization) + }; + + NSNumber *enumValueNumber = stringToEnumMap[mediationNetworkString]; + if (enumValueNumber) { + return (AppsFlyerAdRevenueMediationNetworkType)[enumValueNumber integerValue]; + } else { + return -1; + } +} + /** * log AdRevenue event */ @@ -204,7 +231,9 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command if ([command.arguments count] == 0) { return; } + NSDictionary *afAdRevenueDataMap = (NSDictionary*)[command.arguments objectAtIndex: 0]; + NSDictionary *additionalParametersMap = (NSDictionary*)[command.arguments objectAtIndex: 1]; id monetizationNetwork = nil; id mediationNetwork = nil; @@ -223,21 +252,23 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command mediationNetworkValue = [afAdRevenueDataMap objectForKey:@"mediationNetwork"]; if ([mediationNetworkValue isKindOfClass:[NSString class]]) { - hasConsentForDataUsage = [(NSNumber*)hasConsentForDataUsageValue boolValue]; + mediationNetworkValue = [self getEnumValueFromString: mediationNetworkValue]; + if(mediationNetworkValue != -1){ + mediationNetwork = mediationNetworkValue; + } } - hasConsentForAdsPersonalizationValue = [consentDataMap objectForKey:@"hasConsentForAdsPersonalization"]; - if ([hasConsentForAdsPersonalizationValue isKindOfClass:[NSNumber class]]) { - hasConsentForAdsPersonalization = [(NSNumber*)hasConsentForAdsPersonalizationValue boolValue]; + currencyIso4217CodeValue = [afAdRevenueDataMap objectForKey:@"currencyIso4217Code"]; + if ([currencyIso4217CodeValue isKindOfClass:[NSString class]]) { + currencyIso4217Code = currencyIso4217CodeValue; } - AppsFlyerConsent *consentData = nil; - if (isUserSubjectToGDPR) { - consentData = [[AppsFlyerConsent alloc] initForGDPRUserWithHasConsentForDataUsage:hasConsentForDataUsage hasConsentForAdsPersonalization:hasConsentForAdsPersonalization]; - } else { - consentData = [[AppsFlyerConsent alloc] initNonGDPRUser]; + revenueValue = [afAdRevenueDataMap objectForKey:@"revenue"]; + if ([revenueValue isKindOfClass:[NSNumber class]]) { + revenue = revenueValue; } - [[AppsFlyerLib shared] setConsentData:consentData]; + AFAdRevenueData *adRevenueData = [[AFAdRevenueData alloc] initWithMonetizationNetwork:monetizationNetwork mediationNetwork:mediationNetwork currencyIso4217Code:currencyIso4217Code eventRevenue:revenue]; + [[AppsFlyerLib shared] logAdRevenue:adRevenueData additionalParameters:additionalParametersMap]; } /** From c6757b1343c6ce9d73db20af3b4150eed0e7c0a5 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Tue, 20 Aug 2024 14:23:19 +0300 Subject: [PATCH 05/45] add the enum correctly --- .../cordova/plugin/AppsFlyerPlugin.java | 2 -- www/MediationNetwork.js | 16 ------------- www/appsflyer.js | 24 ++++++++++++++++++- 3 files changed, 23 insertions(+), 19 deletions(-) delete mode 100644 www/MediationNetwork.js diff --git a/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java b/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java index 46b3c28a..478537c6 100644 --- a/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java +++ b/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java @@ -227,8 +227,6 @@ private boolean logAdRevenue(JSONArray args) { }); return true; } - } - /** * set consent data according to GDPR if applies or not. diff --git a/www/MediationNetwork.js b/www/MediationNetwork.js deleted file mode 100644 index af9b0aeb..00000000 --- a/www/MediationNetwork.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = Object.freeze({ - IRONSOURCE:"ironsource", - APPLOVIN_MAX:"applovinmax", - GOOGLE_ADMOB:"googleadmob", - FYBER:"fyber", - APPODEAL:"appodeal", - ADMOST:"Admost", - TOPON:"Topon", - TRADPLUS:"Tradplus", - YANDEX:"Yandex", - CHARTBOOST:"chartboost", - UNITY:"Unity", - TOPON_PTE:"toponpte", - CUSTOM_MEDIATION:"customMediation", - DIRECT_MONETIZATION_NETWORK:"directMonetizationNetwork" -}); \ No newline at end of file diff --git a/www/appsflyer.js b/www/appsflyer.js index ae24fac9..4190d0de 100644 --- a/www/appsflyer.js +++ b/www/appsflyer.js @@ -11,7 +11,29 @@ if (!window.CustomEvent) { }; } + + (function (global) { + + // Enum definition for MediationNetwork + global.MediationNetwork = Object.freeze({ + IRONSOURCE: "ironsource", + APPLOVIN_MAX: "applovinmax", + GOOGLE_ADMOB: "googleadmob", + FYBER: "fyber", + APPODEAL: "appodeal", + ADMOST: "Admost", + TOPON: "Topon", + TRADPLUS: "Tradplus", + YANDEX: "Yandex", + CHARTBOOST: "chartboost", + UNITY: "Unity", + TOPON_PTE: "toponpte", + CUSTOM_MEDIATION: "customMediation", + DIRECT_MONETIZATION_NETWORK: "directMonetizationNetwork" + }); + + var AppsFlyer = function () { }; @@ -114,7 +136,7 @@ if (!window.CustomEvent) { * Public API - logAdRevenue function */ AppsFlyer.prototype.logAdRevenue = function(afAdRevenueData, additionalParameters) { - argscheck.checkArgs('S', 'AppsFlyer.logAdRevenue', arguments); + argscheck.checkArgs('OO', 'AppsFlyer.logAdRevenue', arguments); exec(null, null, 'AppsFlyerPlugin', 'logAdRevenue', [afAdRevenueData, additionalParameters]); }; From d142abce7c4c2a75076a8efee15c8494c0448d8a Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Tue, 20 Aug 2024 14:41:15 +0300 Subject: [PATCH 06/45] change the way we compare --- src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java b/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java index 478537c6..72a2eadc 100644 --- a/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java +++ b/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java @@ -204,7 +204,7 @@ private boolean logAdRevenue(JSONArray args) { if(mediationNetwork != null){ for(MediationNetwork mediationNetworkEnum: MediationNetwork.values()){ - if(mediationNetworkEnum.name().equals(mediationNetwork)){ + if(mediationNetworkEnum.getValue().equals(mediationNetwork)){ mediationNetworkEnumVal = MediationNetwork.valueOf(mediationNetwork); continue; } From 4eeaf15de3a3a8d47fec49e89a1bb4028cd80c3a Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Tue, 20 Aug 2024 15:19:57 +0300 Subject: [PATCH 07/45] fix comparision --- .../com/appsflyer/cordova/plugin/AppsFlyerPlugin.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java b/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java index 72a2eadc..15160b58 100644 --- a/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java +++ b/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java @@ -194,7 +194,7 @@ private boolean logAdRevenue(JSONArray args) { cordova.getThreadPool().execute(() -> { Map additionalParameters = null; try { - if(args.get(0) != null){ + if(!args.get(0).equals(null)){ JSONObject afAdRevenueDataJsonObj = args.getJSONObject(0); String monetizationNetwork = afAdRevenueDataJsonObj.optString("monetizationNetwork", null); String mediationNetwork = afAdRevenueDataJsonObj.optString("mediationNetwork", null); @@ -205,13 +205,13 @@ private boolean logAdRevenue(JSONArray args) { if(mediationNetwork != null){ for(MediationNetwork mediationNetworkEnum: MediationNetwork.values()){ if(mediationNetworkEnum.getValue().equals(mediationNetwork)){ - mediationNetworkEnumVal = MediationNetwork.valueOf(mediationNetwork); + mediationNetworkEnumVal = mediationNetworkEnum; continue; } } } - if(args.get(1) != null){ + if(!args.get(1).equals(null)){ JSONObject additionalParametersJson = args.getJSONObject(1); additionalParameters = toObjectMap(additionalParametersJson); } From 923c27fd8a29c6c0d3cbef0510710ae8d7066a17 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Tue, 20 Aug 2024 15:35:22 +0300 Subject: [PATCH 08/45] change ios to 6.15.1 --- plugin.xml | 2 +- src/ios/AppsFlyerPlugin.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.xml b/plugin.xml index c55bd3d1..92faddc2 100644 --- a/plugin.xml +++ b/plugin.xml @@ -91,7 +91,7 @@ - + diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m index ffe3b8d5..cb60a6bb 100755 --- a/src/ios/AppsFlyerPlugin.m +++ b/src/ios/AppsFlyerPlugin.m @@ -96,7 +96,7 @@ - (void)initSdk:(CDVInvokedUrlCommand*)command } // Initialize the SDK - [[AppsFlyerLib shared] setPluginInfoWith:AFSDKPluginCordova pluginVersion:@"6.15.0" additionalParams:nil]; + [[AppsFlyerLib shared] setPluginInfoWith:AFSDKPluginCordova pluginVersion:@"6.15.1" additionalParams:nil]; [AppsFlyerLib shared].appleAppID = appId; [AppsFlyerLib shared].appsFlyerDevKey = devKey; [AppsFlyerLib shared].isDebug = isDebug; From 6707bdc1fd3bcaf194cabba377df7c281dbee2ff Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Tue, 20 Aug 2024 15:46:23 +0300 Subject: [PATCH 09/45] change incorrect variable type --- src/ios/AppsFlyerPlugin.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m index cb60a6bb..d0e355d7 100755 --- a/src/ios/AppsFlyerPlugin.m +++ b/src/ios/AppsFlyerPlugin.m @@ -238,12 +238,12 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command id monetizationNetwork = nil; id mediationNetwork = nil; id currencyIso4217Code = nil; - id revenue = -1; + int revenue = -1; id monetizationNetworkValue = nil; id mediationNetworkValue = nil; id currencyIso4217CodeValue = nil; - id revenueValue = -1; + int revenueValue = -1; monetizationNetworkValue = [afAdRevenueDataMap objectForKey:@"monetizationNetwork"]; if ([monetizationNetworkValue isKindOfClass:[NSString class]]) { From 60f54d522d9c11b3041aa25ec697bfd13d0a8ac0 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Tue, 20 Aug 2024 16:37:26 +0300 Subject: [PATCH 10/45] update the code in ios --- src/ios/AppsFlyerPlugin.m | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m index d0e355d7..76d47bcb 100755 --- a/src/ios/AppsFlyerPlugin.m +++ b/src/ios/AppsFlyerPlugin.m @@ -236,14 +236,14 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command NSDictionary *additionalParametersMap = (NSDictionary*)[command.arguments objectAtIndex: 1]; id monetizationNetwork = nil; - id mediationNetwork = nil; + AppsFlyerAdRevenueMediationNetworkType mediationNetwork; id currencyIso4217Code = nil; - int revenue = -1; + NSNumber *revenue = 0; id monetizationNetworkValue = nil; id mediationNetworkValue = nil; id currencyIso4217CodeValue = nil; - int revenueValue = -1; + NSNumber *revenueValue = 0; monetizationNetworkValue = [afAdRevenueDataMap objectForKey:@"monetizationNetwork"]; if ([monetizationNetworkValue isKindOfClass:[NSString class]]) { @@ -251,11 +251,8 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command } mediationNetworkValue = [afAdRevenueDataMap objectForKey:@"mediationNetwork"]; - if ([mediationNetworkValue isKindOfClass:[NSString class]]) { - mediationNetworkValue = [self getEnumValueFromString: mediationNetworkValue]; - if(mediationNetworkValue != -1){ - mediationNetwork = mediationNetworkValue; - } + { + mediationNetwork = [self getEnumValueFromString: mediationNetworkValue]; } currencyIso4217CodeValue = [afAdRevenueDataMap objectForKey:@"currencyIso4217Code"]; @@ -265,7 +262,7 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command revenueValue = [afAdRevenueDataMap objectForKey:@"revenue"]; if ([revenueValue isKindOfClass:[NSNumber class]]) { - revenue = revenueValue; + revenue = revenueValue; } AFAdRevenueData *adRevenueData = [[AFAdRevenueData alloc] initWithMonetizationNetwork:monetizationNetwork mediationNetwork:mediationNetwork currencyIso4217Code:currencyIso4217Code eventRevenue:revenue]; [[AppsFlyerLib shared] logAdRevenue:adRevenueData additionalParameters:additionalParametersMap]; From 3147be65cb725bf6e0e5a1afdbf8a81e3b716057 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Tue, 20 Aug 2024 17:21:54 +0300 Subject: [PATCH 11/45] update the api validations --- src/ios/AppsFlyerPlugin.m | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m index 76d47bcb..ea1dbf7f 100755 --- a/src/ios/AppsFlyerPlugin.m +++ b/src/ios/AppsFlyerPlugin.m @@ -243,7 +243,7 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command id monetizationNetworkValue = nil; id mediationNetworkValue = nil; id currencyIso4217CodeValue = nil; - NSNumber *revenueValue = 0; + id revenueValue = nil; monetizationNetworkValue = [afAdRevenueDataMap objectForKey:@"monetizationNetwork"]; if ([monetizationNetworkValue isKindOfClass:[NSString class]]) { @@ -251,8 +251,13 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command } mediationNetworkValue = [afAdRevenueDataMap objectForKey:@"mediationNetwork"]; - { - mediationNetwork = [self getEnumValueFromString: mediationNetworkValue]; + if ([mediationNetworkValue isKindOfClass:[NSString class]]) { + if([self getEnumValueFromString: mediationNetworkValue] != -1){ + mediationNetwork = [self getEnumValueFromString: mediationNetworkValue]; + } + else{ + return; + } } currencyIso4217CodeValue = [afAdRevenueDataMap objectForKey:@"currencyIso4217Code"]; @@ -264,10 +269,13 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command if ([revenueValue isKindOfClass:[NSNumber class]]) { revenue = revenueValue; } - AFAdRevenueData *adRevenueData = [[AFAdRevenueData alloc] initWithMonetizationNetwork:monetizationNetwork mediationNetwork:mediationNetwork currencyIso4217Code:currencyIso4217Code eventRevenue:revenue]; - [[AppsFlyerLib shared] logAdRevenue:adRevenueData additionalParameters:additionalParametersMap]; + if(monetizationNetwork != nil && currencyIso4217Code != nil && revenue != nil){ + AFAdRevenueData *adRevenueData = [[AFAdRevenueData alloc] initWithMonetizationNetwork:monetizationNetwork mediationNetwork:mediationNetwork currencyIso4217Code:currencyIso4217Code eventRevenue:revenue]; + [[AppsFlyerLib shared] logAdRevenue:adRevenueData additionalParameters:additionalParametersMap]; + } } + /** * Sets new currency code. currencyId: ISO 4217 Currency Codes. */ From 8822691d50a32e509ebfecf7288b764fc02fbeba Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Tue, 20 Aug 2024 17:48:02 +0300 Subject: [PATCH 12/45] add more checks --- src/ios/AppsFlyerPlugin.m | 53 ++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m index ea1dbf7f..25092ef3 100755 --- a/src/ios/AppsFlyerPlugin.m +++ b/src/ios/AppsFlyerPlugin.m @@ -245,33 +245,40 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command id currencyIso4217CodeValue = nil; id revenueValue = nil; - monetizationNetworkValue = [afAdRevenueDataMap objectForKey:@"monetizationNetwork"]; - if ([monetizationNetworkValue isKindOfClass:[NSString class]]) { - monetizationNetwork = monetizationNetworkValue; - } - - mediationNetworkValue = [afAdRevenueDataMap objectForKey:@"mediationNetwork"]; - if ([mediationNetworkValue isKindOfClass:[NSString class]]) { - if([self getEnumValueFromString: mediationNetworkValue] != -1){ - mediationNetwork = [self getEnumValueFromString: mediationNetworkValue]; + if(![afAdRevenueDataMap isKindOfClass:[NSNull class]]){ + monetizationNetworkValue = [afAdRevenueDataMap objectForKey:@"monetizationNetwork"]; + if ([monetizationNetworkValue isKindOfClass:[NSString class]]) { + monetizationNetwork = monetizationNetworkValue; } - else{ - return; + + mediationNetworkValue = [afAdRevenueDataMap objectForKey:@"mediationNetwork"]; + if ([mediationNetworkValue isKindOfClass:[NSString class]]) { + if([self getEnumValueFromString: mediationNetworkValue] != -1){ + mediationNetwork = [self getEnumValueFromString: mediationNetworkValue]; + } + else{ + return; + } } - } - currencyIso4217CodeValue = [afAdRevenueDataMap objectForKey:@"currencyIso4217Code"]; - if ([currencyIso4217CodeValue isKindOfClass:[NSString class]]) { - currencyIso4217Code = currencyIso4217CodeValue; - } + currencyIso4217CodeValue = [afAdRevenueDataMap objectForKey:@"currencyIso4217Code"]; + if ([currencyIso4217CodeValue isKindOfClass:[NSString class]]) { + currencyIso4217Code = currencyIso4217CodeValue; + } - revenueValue = [afAdRevenueDataMap objectForKey:@"revenue"]; - if ([revenueValue isKindOfClass:[NSNumber class]]) { - revenue = revenueValue; - } - if(monetizationNetwork != nil && currencyIso4217Code != nil && revenue != nil){ - AFAdRevenueData *adRevenueData = [[AFAdRevenueData alloc] initWithMonetizationNetwork:monetizationNetwork mediationNetwork:mediationNetwork currencyIso4217Code:currencyIso4217Code eventRevenue:revenue]; - [[AppsFlyerLib shared] logAdRevenue:adRevenueData additionalParameters:additionalParametersMap]; + revenueValue = [afAdRevenueDataMap objectForKey:@"revenue"]; + if ([revenueValue isKindOfClass:[NSNumber class]]) { + revenue = revenueValue; + } + if(monetizationNetwork != nil && currencyIso4217Code != nil && revenue != nil){ + AFAdRevenueData *adRevenueData = [[AFAdRevenueData alloc] initWithMonetizationNetwork:monetizationNetwork mediationNetwork:mediationNetwork currencyIso4217Code:currencyIso4217Code eventRevenue:revenue]; + if([additionalParametersMap isKindOfClass:[NSNull class]]){ + [[AppsFlyerLib shared] logAdRevenue:adRevenueData additionalParameters:nil]; + } + else{ + [[AppsFlyerLib shared] logAdRevenue:adRevenueData additionalParameters:additionalParametersMap]; + } + } } } From afd1051cc0a8470d988d177fcd910923dc849e04 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Thu, 22 Aug 2024 11:28:19 +0300 Subject: [PATCH 13/45] dummy push --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index 35f0d1d5..a872cf5a 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,5 @@ { + "name": "cordova-plugin-appsflyer-sdk", "version": "6.15.0-rc1", "description": "Cordova AppsFlyer SDK Plugin", @@ -50,3 +51,4 @@ }, "dependencies": {} } + From 01fc71cda74780746e96b365de00b43d66688aa2 Mon Sep 17 00:00:00 2001 From: pazlavi Date: Thu, 22 Aug 2024 08:28:48 +0000 Subject: [PATCH 14/45] update plugin.xml and package.json files --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a872cf5a..6dec37b7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cordova-plugin-appsflyer-sdk", - "version": "6.15.0-rc1", + "version": "6.15.0-rc3", "description": "Cordova AppsFlyer SDK Plugin", "cordova": { "id": "cordova-plugin-appsflyer-sdk", From 04aea754578f29f9a386e45c17335044a3eb3ea2 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Thu, 29 Aug 2024 11:49:03 +0300 Subject: [PATCH 15/45] dummy --- plugin.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index 92faddc2..ad98403a 100644 --- a/plugin.xml +++ b/plugin.xml @@ -95,6 +95,5 @@ - From c5107798ff0d563b6befa25dac45d2904c076056 Mon Sep 17 00:00:00 2001 From: pazlavi Date: Thu, 29 Aug 2024 08:49:32 +0000 Subject: [PATCH 16/45] update plugin.xml and package.json files --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6dec37b7..b40e085b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cordova-plugin-appsflyer-sdk", - "version": "6.15.0-rc3", + "version": "6.15.1-rc1", "description": "Cordova AppsFlyer SDK Plugin", "cordova": { "id": "cordova-plugin-appsflyer-sdk", From 1531af320b2bd660a830ab0137039eafe117a1e4 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Thu, 29 Aug 2024 11:53:54 +0300 Subject: [PATCH 17/45] dummy --- plugin.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index ad98403a..0e57f875 100644 --- a/plugin.xml +++ b/plugin.xml @@ -95,5 +95,4 @@ - From 990f1fe9a5934fb67b6dee91d9523ed44591c665 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Thu, 29 Aug 2024 12:02:47 +0300 Subject: [PATCH 18/45] dummy --- plugin.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugin.xml b/plugin.xml index 0e57f875..ad98403a 100644 --- a/plugin.xml +++ b/plugin.xml @@ -95,4 +95,5 @@ + From 7baac1b812d23a695502f2b1e121fde63501ac00 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Thu, 29 Aug 2024 12:08:57 +0300 Subject: [PATCH 19/45] dummy p --- plugin.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugin.xml b/plugin.xml index ad98403a..92faddc2 100644 --- a/plugin.xml +++ b/plugin.xml @@ -95,5 +95,6 @@ + From c98e8b1ca5d23d3868d4778bf007b5dc19094ddc Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Thu, 29 Aug 2024 12:11:38 +0300 Subject: [PATCH 20/45] p --- plugin.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index 92faddc2..ad98403a 100644 --- a/plugin.xml +++ b/plugin.xml @@ -95,6 +95,5 @@ - From 2bfce31b776d09ecb6b04905aa0e50fad8010408 Mon Sep 17 00:00:00 2001 From: pazlavi Date: Thu, 29 Aug 2024 09:12:05 +0000 Subject: [PATCH 21/45] update plugin.xml and package.json files --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b40e085b..1c14ac7c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cordova-plugin-appsflyer-sdk", - "version": "6.15.1-rc1", + "version": "6.15.1-rc2", "description": "Cordova AppsFlyer SDK Plugin", "cordova": { "id": "cordova-plugin-appsflyer-sdk", From e6259006a0970a38af405821689a942b50762a92 Mon Sep 17 00:00:00 2001 From: pazlavi Date: Thu, 29 Aug 2024 09:14:16 +0000 Subject: [PATCH 22/45] 6.15.1 --- package.json | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c14ac7c..f2f417a6 100644 --- a/package.json +++ b/package.json @@ -1,54 +1,104 @@ { "name": "cordova-plugin-appsflyer-sdk", - "version": "6.15.1-rc2", + + "version": "6.15.1", + "description": "Cordova AppsFlyer SDK Plugin", + "cordova": { + "id": "cordova-plugin-appsflyer-sdk", + "platforms": [ + "android", + "ios" + ] + }, + "repository": { + "type": "git", + "url": "git+https://github.com/AppsFlyerSDK/cordova-plugin-appsflyer-sdk.git" + }, + "keywords": [ + "cordova", + "appsflyer", + "ecosystem:cordova", + "cordova-android", + "cordova-ios" + ], + "engines": [ + { + "name": "cordova", + "version": ">=4.3.0" + } + ], + "author": "Appsflyer", + "license": { + "type": "MIT", + "url": "https://github.com/AppsFlyerSDK/appsflyer-cordova-plugin/blob/master/LICENSE" + }, + "bugs": { + "url": "https://github.com/AppsFlyerSDK/cordova-plugin-appsflyer-sdk/issues" + }, + "homepage": "https://github.com/AppsFlyerSDK/cordova-plugin-appsflyer-sdk#readme", + "scripts": { + "test": "npm run jshint", + "jshint": "node node_modules/jshint/bin/jshint www && node node_modules/jshint/bin/jshint src && node node_modules/jshint/bin/jshint tests", + "setupIonicCordova": "cd examples/ionic-cordova; npm install; ionic cordova plugin rm cordova-plugin-appsflyer-sdk --save; ionic cordova platform rm android; ionic cordova platform rm ios; ionic cordova plugin add cordova-plugin-appsflyer-sdk --save; ionic cordova platform add android; ionic cordova platform add ios", + "runIonicCordovaIos": "cd examples/ionic-cordova; ionic cordova prepare ios; ionic cordova run ios;", + "runIonicCordovaAndroid": "cd examples/ionic-cordova; ionic cordova prepare android; ionic cordova run android;", + "setupCordova": "cd examples/cordova; npm install; cordova plugin rm cordova-plugin-appsflyer-sdk --save; cordova platform rm android; cordova platform rm ios; cordova plugin add cordova-plugin-appsflyer-sdk --save; cordova platform add android; cordova platform add ios", + "runCordovaIos": "cd examples/cordova; cordova prepare ios; cordova run ios;", + "runCordovaAndroid": "cd examples/cordova; cordova prepare android; cordova run android;" + }, + "devDependencies": { + "jshint": "^2.6.0" + }, + "dependencies": {} + } From 99a0cb3c1d999c1da83412746d5164b4a8afe57b Mon Sep 17 00:00:00 2001 From: pazlavi Date: Thu, 29 Aug 2024 09:14:19 +0000 Subject: [PATCH 23/45] Update RELEASENOTES.md --- RELEASENOTES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index acced19a..3b74ac94 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,3 +1,8 @@ +## 6.15.1 + Release date: *2024-08-29* + +- Cordova >> Update Plugin to v6.15.1 + ## 6.14.3 Release date: *2024-04-30* From 835ce1bb596bf9d7d21620d62f34167c9e7d262a Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Thu, 29 Aug 2024 14:28:47 +0300 Subject: [PATCH 24/45] add nsnull default val --- src/ios/AppsFlyerPlugin.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m index 25092ef3..20035133 100755 --- a/src/ios/AppsFlyerPlugin.m +++ b/src/ios/AppsFlyerPlugin.m @@ -232,7 +232,7 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command return; } - NSDictionary *afAdRevenueDataMap = (NSDictionary*)[command.arguments objectAtIndex: 0]; + NSDictionary *afAdRevenueDataMap = (NSDictionary*)[command.arguments objectAtIndex: 0 withDefault:[NSNull null]]; NSDictionary *additionalParametersMap = (NSDictionary*)[command.arguments objectAtIndex: 1]; id monetizationNetwork = nil; From d1f3c08015573d20d4e22b7a67b4d5e958a36aa7 Mon Sep 17 00:00:00 2001 From: pazlavi Date: Thu, 29 Aug 2024 11:29:12 +0000 Subject: [PATCH 25/45] update plugin.xml and package.json files --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2f417a6..7f90a5d2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "cordova-plugin-appsflyer-sdk", - "version": "6.15.1", + "version": "6.15.1-rc2", "description": "Cordova AppsFlyer SDK Plugin", From a026e6caf46eae13852d5aed13f24f52d89de06f Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Thu, 29 Aug 2024 14:32:42 +0300 Subject: [PATCH 26/45] add more nil check --- src/ios/AppsFlyerPlugin.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m index 20035133..531048ec 100755 --- a/src/ios/AppsFlyerPlugin.m +++ b/src/ios/AppsFlyerPlugin.m @@ -247,12 +247,12 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command if(![afAdRevenueDataMap isKindOfClass:[NSNull class]]){ monetizationNetworkValue = [afAdRevenueDataMap objectForKey:@"monetizationNetwork"]; - if ([monetizationNetworkValue isKindOfClass:[NSString class]]) { + if (monetizationNetworkValue != nil && [monetizationNetworkValue isKindOfClass:[NSString class]]) { monetizationNetwork = monetizationNetworkValue; } mediationNetworkValue = [afAdRevenueDataMap objectForKey:@"mediationNetwork"]; - if ([mediationNetworkValue isKindOfClass:[NSString class]]) { + if (mediationNetworkValue != nil && [mediationNetworkValue isKindOfClass:[NSString class]]) { if([self getEnumValueFromString: mediationNetworkValue] != -1){ mediationNetwork = [self getEnumValueFromString: mediationNetworkValue]; } @@ -262,12 +262,12 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command } currencyIso4217CodeValue = [afAdRevenueDataMap objectForKey:@"currencyIso4217Code"]; - if ([currencyIso4217CodeValue isKindOfClass:[NSString class]]) { + if (currencyIso4217CodeValue != nil && [currencyIso4217CodeValue isKindOfClass:[NSString class]]) { currencyIso4217Code = currencyIso4217CodeValue; } revenueValue = [afAdRevenueDataMap objectForKey:@"revenue"]; - if ([revenueValue isKindOfClass:[NSNumber class]]) { + if (revenueValue != nil && [revenueValue isKindOfClass:[NSNumber class]]) { revenue = revenueValue; } if(monetizationNetwork != nil && currencyIso4217Code != nil && revenue != nil){ From 403b5b600d7c69d9b5338ed345af7341be9f956a Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Thu, 29 Aug 2024 15:54:35 +0300 Subject: [PATCH 27/45] apply code review changes --- plugin.xml | 2 +- .../com/appsflyer/cordova/plugin/AppsFlyerConstants.java | 2 +- src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugin.xml b/plugin.xml index ad98403a..d468a3d2 100644 --- a/plugin.xml +++ b/plugin.xml @@ -95,5 +95,5 @@ - + diff --git a/src/android/com/appsflyer/cordova/plugin/AppsFlyerConstants.java b/src/android/com/appsflyer/cordova/plugin/AppsFlyerConstants.java index f5bdc93c..7acf7db9 100644 --- a/src/android/com/appsflyer/cordova/plugin/AppsFlyerConstants.java +++ b/src/android/com/appsflyer/cordova/plugin/AppsFlyerConstants.java @@ -6,7 +6,7 @@ public class AppsFlyerConstants { - final static String PLUGIN_VERSION = "6.15.0"; + final static String PLUGIN_VERSION = "6.15.1"; final static String NO_DEVKEY_FOUND = "AppsFlyer 'devKey' is missing or empty"; final static String NO_GCM_PROJECT_NUMBER_PROVIDED = "No GCM Project number provided"; final static String SUCCESS = "Success"; diff --git a/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java b/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java index 15160b58..5cc81b6f 100644 --- a/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java +++ b/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java @@ -215,11 +215,13 @@ private boolean logAdRevenue(JSONArray args) { JSONObject additionalParametersJson = args.getJSONObject(1); additionalParameters = toObjectMap(additionalParametersJson); } - if(mediationNetworkEnumVal != null){ AFAdRevenueData afAdRevenueData = new AFAdRevenueData(monetizationNetwork, mediationNetworkEnumVal, currencyIso4217Code, revenue); AppsFlyerLib.getInstance().logAdRevenue(afAdRevenueData, additionalParameters); } + else{ + Log.d("AppsFlyer", "Could not log Ad-Revenue event, bad inputs"); + } } } catch (JSONException e) { e.printStackTrace(); From 7635fc1c9494822d418c371a58670c8822d3b227 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Sun, 1 Sep 2024 11:46:30 +0300 Subject: [PATCH 28/45] change the impl --- src/ios/AppsFlyerPlugin.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m index 531048ec..d6914d85 100755 --- a/src/ios/AppsFlyerPlugin.m +++ b/src/ios/AppsFlyerPlugin.m @@ -232,7 +232,7 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command return; } - NSDictionary *afAdRevenueDataMap = (NSDictionary*)[command.arguments objectAtIndex: 0 withDefault:[NSNull null]]; + NSDictionary* afAdRevenueDataMap = [command argumentAtIndex:0 withDefault:[NSNull null]]; NSDictionary *additionalParametersMap = (NSDictionary*)[command.arguments objectAtIndex: 1]; id monetizationNetwork = nil; From 3f93af7ff8a798e552f5b9f004680cd78631fadb Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Mon, 2 Sep 2024 12:47:34 +0300 Subject: [PATCH 29/45] change impl for additional params map ios --- src/ios/AppsFlyerPlugin.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m index d6914d85..d78ce0f6 100755 --- a/src/ios/AppsFlyerPlugin.m +++ b/src/ios/AppsFlyerPlugin.m @@ -233,7 +233,7 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command } NSDictionary* afAdRevenueDataMap = [command argumentAtIndex:0 withDefault:[NSNull null]]; - NSDictionary *additionalParametersMap = (NSDictionary*)[command.arguments objectAtIndex: 1]; + NSDictionary* additionalParametersMap = [command argumentAtIndex:1 withDefault:[NSNull null]]; id monetizationNetwork = nil; AppsFlyerAdRevenueMediationNetworkType mediationNetwork; From a369e7313bfb0b828d1ae6798d693174bcbdb1ec Mon Sep 17 00:00:00 2001 From: pazlavi Date: Mon, 2 Sep 2024 09:48:55 +0000 Subject: [PATCH 30/45] update plugin.xml and package.json files --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7f90a5d2..b323ef1c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "cordova-plugin-appsflyer-sdk", - "version": "6.15.1-rc2", + "version": "6.15.1-rc3", "description": "Cordova AppsFlyer SDK Plugin", From 6b017a3d94f3bbd6df5476c1e1a4bbacf21c8526 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Mon, 2 Sep 2024 12:58:48 +0300 Subject: [PATCH 31/45] add nslog fot invalid args --- src/ios/AppsFlyerPlugin.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m index d78ce0f6..060b8f00 100755 --- a/src/ios/AppsFlyerPlugin.m +++ b/src/ios/AppsFlyerPlugin.m @@ -279,6 +279,9 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command [[AppsFlyerLib shared] logAdRevenue:adRevenueData additionalParameters:additionalParametersMap]; } } + else{ + NSLog(@"one or more arguments are invalid"); + } } } From 51a2379f2dad451cf9d90da6a31ac6408bab59c1 Mon Sep 17 00:00:00 2001 From: pazlavi Date: Mon, 2 Sep 2024 12:58:05 +0000 Subject: [PATCH 32/45] 6.15.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b323ef1c..f2f417a6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "cordova-plugin-appsflyer-sdk", - "version": "6.15.1-rc3", + "version": "6.15.1", "description": "Cordova AppsFlyer SDK Plugin", From 381f720b06bec1b312696874729bd3b8fdaa464f Mon Sep 17 00:00:00 2001 From: pazlavi Date: Mon, 2 Sep 2024 12:58:08 +0000 Subject: [PATCH 33/45] Update RELEASENOTES.md --- RELEASENOTES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 3b74ac94..4235ab28 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,3 +1,8 @@ +## 6.15.1 + Release date: *2024-09-02* + +- Cordova >> Update Plugin to v6.15.1 + ## 6.15.1 Release date: *2024-08-29* From 0afc51d80719e33afd404c71b00d690ee58ff141 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Mon, 2 Sep 2024 16:31:05 +0300 Subject: [PATCH 34/45] add documentation --- README.md | 11 +++++++++-- docs/API.md | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a0130301..6edc0d53 100755 --- a/README.md +++ b/README.md @@ -24,6 +24,8 @@ For lower versions of cordova-android please use plugin version 4.3.3 available - From version **6.1.10** the plugin uses cocoapods(NOT StaticLib) in order to support iOS app-kids Strict mode.
You can read more [here](https://support.appsflyer.com/hc/en-us/articles/207032066#integration-strict-mode-sdk) - From version **6.10.2** the plugin requires using the implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.6.20' in Android. +- From version **6.14.3** the plugin requires Target version 12 and higher in iOS. +- From version **6.15.1** the plugin requires adding the value '/usr/lib/swift' to Build Settings 'RunPath Search Paths' key in iOS. ---------- @@ -42,8 +44,13 @@ You can read more [here](https://support.appsflyer.com/hc/en-us/articles/2070320 ### This plugin is built for -- iOS AppsFlyerSDK **v6.14.3** -- Android AppsFlyerSDK **v6.14.0** +- iOS AppsFlyerSDK **v6.15.1** +- Android AppsFlyerSDK **v6.15.0** + +### ❗v6.15.1 Breaking Changes + +iOS platform: +The plugin requires adding the value '/usr/lib/swift' to Build Settings 'RunPath Search Paths' key in iOS, Otherwise there might be some compilation errors. ### ❗v6.14.3 Breaking Changes diff --git a/docs/API.md b/docs/API.md index 889d3323..3b0391ed 100755 --- a/docs/API.md +++ b/docs/API.md @@ -52,7 +52,8 @@ The list of available methods for this plugin is described below. | [`sendPushNotificationData`](#sendPushNotificationData) | `(Object data)` | Measure and get data from push-notification campaigns. | | [`setDisableNetworkData`](#setDisableNetworkData) | `(boolean disable)` | Use to opt-out of collecting the network operator name (carrier) and sim operator name from the device. | | [`setConsentData`](#setConsentData) | `(boolean disable)` | Use to manually collecting the consent data from the user. | -| [`enableTCFDataCollection`](#enableTCFDataCollection) | `(boolean enable)` | instruct the SDK to collect the TCF data from the device. | +| [`enableTCFDataCollection`](#enableTCFDataCollection) | `(boolean enable)` | instruct the SDK to collect the TCF data from the device. | +| [`logAdRevenue`](#logAdRevenue) | `(Object adRevenueData, Object additionalParams)` | Log ad revenue event. | --- @@ -799,6 +800,37 @@ window.plugins.appsFlyer.enableTCFDataCollection(true); ``` --- + +##### **`logAdRevenue(adRevenueData, additionalParams): void`** +log ad-revenue event. + +| parameter | type | description | +|------------------|----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `adRevenueData` | `Object` | the object must contain the following fields:
monetizationNetwork: String testMonetizationNetwork
mediationNetwork: MediationNetwork testMediationNetwork
currencyIso4217Code: String currencyByIso4217CodeFormat
revenue:double revenue | +| `additionalData` | `Object` | additional Params Data map, @Nullable | + + +*Example:* + +```javascript + +let mediationNetwork = MediationNetwork.TOPON; +let adRevenueData = { + 'monetizationNetwork': 'testMonetizationNetwork', + 'mediationNetwork': mediationNetwork, + 'currencyIso4217Code': 'USD', + 'revenue': 15.0 +}; +let additionalParams = { + 'additionalKey1':'additionalValue1', + 'additionalKey2':'additionalValue2' +} +window.plugins.appsFlyer.logAdRevenue(adRevenueData, additionalParams); +``` + +--- + + ### Deep linking Tracking From 2c11dddffbe99384689a46d3ff71dfb6e261a7ef Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Mon, 2 Sep 2024 16:34:56 +0300 Subject: [PATCH 35/45] add more documentation --- docs/API.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/API.md b/docs/API.md index 3b0391ed..d5afc07d 100755 --- a/docs/API.md +++ b/docs/API.md @@ -826,8 +826,18 @@ let additionalParams = { 'additionalKey2':'additionalValue2' } window.plugins.appsFlyer.logAdRevenue(adRevenueData, additionalParams); + + ``` +Here's how you use `appsFlyer.logAdRevenue` within a Cordova app: + +1. Prepare the `adRevenueData` object as shown, including any additional parameters you wish to track along with the ad revenue event. +2. Call the `appsFlyer.logAdRevenue` method with the `adRevenueData` object. + +By passing all the required fields in `AFAdRevenueData`, you help ensure accurate tracking within the AppsFlyer platform. This enables you to analyze your ad revenue alongside other user acquisition data to optimize your app's overall monetization strategy. +**Note:** +The `additionalParameters` object is optional. You can add any additional data you want to log with the ad revenue event in this object. This can be useful for detailed analytics or specific event tracking later on. Make sure that the custom parameters follow the data types and structures specified by AppsFlyer in their documentation. --- From e595438bee55be2ccd138864d65b9a9742a00932 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Mon, 2 Sep 2024 16:36:46 +0300 Subject: [PATCH 36/45] rm dup --- RELEASENOTES.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 4235ab28..010283d7 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -3,11 +3,6 @@ - Cordova >> Update Plugin to v6.15.1 -## 6.15.1 - Release date: *2024-08-29* - -- Cordova >> Update Plugin to v6.15.1 - ## 6.14.3 Release date: *2024-04-30* From 46823ca16c120feadd65566ea4bc08f153cd034d Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Mon, 2 Sep 2024 17:03:40 +0300 Subject: [PATCH 37/45] add more logs --- src/ios/AppsFlyerPlugin.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m index 060b8f00..28db8aed 100755 --- a/src/ios/AppsFlyerPlugin.m +++ b/src/ios/AppsFlyerPlugin.m @@ -257,6 +257,7 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command mediationNetwork = [self getEnumValueFromString: mediationNetworkValue]; } else{ + NSLog(@"mediationNetwork param is not according to the Enum format"); return; } } @@ -280,9 +281,12 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command } } else{ - NSLog(@"one or more arguments are invalid"); + NSLog(@"one or more arguments are invalid or nil"); } } + else{ + NSLog(@"afAdRevenueDataMap is invalid or null"); + } } From 9b21a5d90ebd16c068c05d7b0377b2ecd96b3d3c Mon Sep 17 00:00:00 2001 From: pazlavi Date: Mon, 2 Sep 2024 14:04:11 +0000 Subject: [PATCH 38/45] update plugin.xml and package.json files --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2f417a6..b323ef1c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "cordova-plugin-appsflyer-sdk", - "version": "6.15.1", + "version": "6.15.1-rc3", "description": "Cordova AppsFlyer SDK Plugin", From ebb8b05cab9bdb4b5f8daba597e141ce99c13125 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Mon, 2 Sep 2024 17:04:38 +0300 Subject: [PATCH 39/45] typo --- src/ios/AppsFlyerPlugin.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m index 28db8aed..796ccc79 100755 --- a/src/ios/AppsFlyerPlugin.m +++ b/src/ios/AppsFlyerPlugin.m @@ -285,7 +285,7 @@ - (void)logAdRevenue:(CDVInvokedUrlCommand*)command } } else{ - NSLog(@"afAdRevenueDataMap is invalid or null"); + NSLog(@"afAdRevenueDataMap is invalid or nil"); } } From 5f5fe4d24c98315726dd5e6a6675180596a2ac10 Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Mon, 2 Sep 2024 17:07:32 +0300 Subject: [PATCH 40/45] fix for ci --- package.json | 52 +--------------------------------------------------- 1 file changed, 1 insertion(+), 51 deletions(-) diff --git a/package.json b/package.json index b323ef1c..6c5206ff 100644 --- a/package.json +++ b/package.json @@ -1,104 +1,54 @@ { "name": "cordova-plugin-appsflyer-sdk", - - "version": "6.15.1-rc3", - + "version": "6.14.3", "description": "Cordova AppsFlyer SDK Plugin", - "cordova": { - "id": "cordova-plugin-appsflyer-sdk", - "platforms": [ - "android", - "ios" - ] - }, - "repository": { - "type": "git", - "url": "git+https://github.com/AppsFlyerSDK/cordova-plugin-appsflyer-sdk.git" - }, - "keywords": [ - "cordova", - "appsflyer", - "ecosystem:cordova", - "cordova-android", - "cordova-ios" - ], - "engines": [ - { - "name": "cordova", - "version": ">=4.3.0" - } - ], - "author": "Appsflyer", - "license": { - "type": "MIT", - "url": "https://github.com/AppsFlyerSDK/appsflyer-cordova-plugin/blob/master/LICENSE" - }, - "bugs": { - "url": "https://github.com/AppsFlyerSDK/cordova-plugin-appsflyer-sdk/issues" - }, - "homepage": "https://github.com/AppsFlyerSDK/cordova-plugin-appsflyer-sdk#readme", - "scripts": { - "test": "npm run jshint", - "jshint": "node node_modules/jshint/bin/jshint www && node node_modules/jshint/bin/jshint src && node node_modules/jshint/bin/jshint tests", - "setupIonicCordova": "cd examples/ionic-cordova; npm install; ionic cordova plugin rm cordova-plugin-appsflyer-sdk --save; ionic cordova platform rm android; ionic cordova platform rm ios; ionic cordova plugin add cordova-plugin-appsflyer-sdk --save; ionic cordova platform add android; ionic cordova platform add ios", - "runIonicCordovaIos": "cd examples/ionic-cordova; ionic cordova prepare ios; ionic cordova run ios;", - "runIonicCordovaAndroid": "cd examples/ionic-cordova; ionic cordova prepare android; ionic cordova run android;", - "setupCordova": "cd examples/cordova; npm install; cordova plugin rm cordova-plugin-appsflyer-sdk --save; cordova platform rm android; cordova platform rm ios; cordova plugin add cordova-plugin-appsflyer-sdk --save; cordova platform add android; cordova platform add ios", - "runCordovaIos": "cd examples/cordova; cordova prepare ios; cordova run ios;", - "runCordovaAndroid": "cd examples/cordova; cordova prepare android; cordova run android;" - }, - "devDependencies": { - "jshint": "^2.6.0" - }, - "dependencies": {} - } From c41417a27bcb1fd4e53e2f7ec16506c2cfb320c8 Mon Sep 17 00:00:00 2001 From: pazlavi Date: Mon, 2 Sep 2024 14:07:59 +0000 Subject: [PATCH 41/45] update plugin.xml and package.json files --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c5206ff..5fb88785 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cordova-plugin-appsflyer-sdk", - "version": "6.14.3", + "version": "6.15.1-rc3", "description": "Cordova AppsFlyer SDK Plugin", "cordova": { "id": "cordova-plugin-appsflyer-sdk", From 63db06c3d549d0f557d632eb4b801fd55b9b6b0a Mon Sep 17 00:00:00 2001 From: Noa Kogonia Date: Mon, 2 Sep 2024 17:11:03 +0300 Subject: [PATCH 42/45] fix for ci --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5fb88785..6c5206ff 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cordova-plugin-appsflyer-sdk", - "version": "6.15.1-rc3", + "version": "6.14.3", "description": "Cordova AppsFlyer SDK Plugin", "cordova": { "id": "cordova-plugin-appsflyer-sdk", From 5aff575ee6b35bf4265308d647105fe1f2275586 Mon Sep 17 00:00:00 2001 From: pazlavi Date: Mon, 2 Sep 2024 14:13:14 +0000 Subject: [PATCH 43/45] update plugin.xml and package.json files --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c5206ff..f22a8092 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cordova-plugin-appsflyer-sdk", - "version": "6.14.3", + "version": "6.15.1-rc4", "description": "Cordova AppsFlyer SDK Plugin", "cordova": { "id": "cordova-plugin-appsflyer-sdk", From 06079d73acf23c9f66cc9d3c3e9cba443273a801 Mon Sep 17 00:00:00 2001 From: pazlavi Date: Mon, 2 Sep 2024 14:13:54 +0000 Subject: [PATCH 44/45] 6.15.1 --- package.json | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index f22a8092..f2f417a6 100644 --- a/package.json +++ b/package.json @@ -1,54 +1,104 @@ { "name": "cordova-plugin-appsflyer-sdk", - "version": "6.15.1-rc4", + + "version": "6.15.1", + "description": "Cordova AppsFlyer SDK Plugin", + "cordova": { + "id": "cordova-plugin-appsflyer-sdk", + "platforms": [ + "android", + "ios" + ] + }, + "repository": { + "type": "git", + "url": "git+https://github.com/AppsFlyerSDK/cordova-plugin-appsflyer-sdk.git" + }, + "keywords": [ + "cordova", + "appsflyer", + "ecosystem:cordova", + "cordova-android", + "cordova-ios" + ], + "engines": [ + { + "name": "cordova", + "version": ">=4.3.0" + } + ], + "author": "Appsflyer", + "license": { + "type": "MIT", + "url": "https://github.com/AppsFlyerSDK/appsflyer-cordova-plugin/blob/master/LICENSE" + }, + "bugs": { + "url": "https://github.com/AppsFlyerSDK/cordova-plugin-appsflyer-sdk/issues" + }, + "homepage": "https://github.com/AppsFlyerSDK/cordova-plugin-appsflyer-sdk#readme", + "scripts": { + "test": "npm run jshint", + "jshint": "node node_modules/jshint/bin/jshint www && node node_modules/jshint/bin/jshint src && node node_modules/jshint/bin/jshint tests", + "setupIonicCordova": "cd examples/ionic-cordova; npm install; ionic cordova plugin rm cordova-plugin-appsflyer-sdk --save; ionic cordova platform rm android; ionic cordova platform rm ios; ionic cordova plugin add cordova-plugin-appsflyer-sdk --save; ionic cordova platform add android; ionic cordova platform add ios", + "runIonicCordovaIos": "cd examples/ionic-cordova; ionic cordova prepare ios; ionic cordova run ios;", + "runIonicCordovaAndroid": "cd examples/ionic-cordova; ionic cordova prepare android; ionic cordova run android;", + "setupCordova": "cd examples/cordova; npm install; cordova plugin rm cordova-plugin-appsflyer-sdk --save; cordova platform rm android; cordova platform rm ios; cordova plugin add cordova-plugin-appsflyer-sdk --save; cordova platform add android; cordova platform add ios", + "runCordovaIos": "cd examples/cordova; cordova prepare ios; cordova run ios;", + "runCordovaAndroid": "cd examples/cordova; cordova prepare android; cordova run android;" + }, + "devDependencies": { + "jshint": "^2.6.0" + }, + "dependencies": {} + } From af330b18353d0b7c9f2826b1c44035de81ba2586 Mon Sep 17 00:00:00 2001 From: pazlavi Date: Mon, 2 Sep 2024 14:13:56 +0000 Subject: [PATCH 45/45] Update RELEASENOTES.md --- RELEASENOTES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 010283d7..bf7b6ee9 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -3,6 +3,11 @@ - Cordova >> Update Plugin to v6.15.1 +## 6.15.1 + Release date: *2024-09-02* + +- Cordova >> Update Plugin to v6.15.1 + ## 6.14.3 Release date: *2024-04-30*