Merge pull request #28 from AppsFlyerSDK/dev/RD-69094/6.4.0

Dev/rd 69094/6.4.0

Author: af-margot

Classes/AppsFlyer/AppsFlyerX.cpp

@@ -462,6 +462,7 @@ void AppsFlyerX::stop(bool shouldStop) {
 #endif
 }
 
+[[deprecated("This method is deprecated, please replace by setSharingFilterForPartners API")]]
 void AppsFlyerX::sharingFilter(std::vector<std::string> partners){
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     AppsFlyerXAndroid::sharingFilter(partners);
@@ -470,6 +471,7 @@ void AppsFlyerX::sharingFilter(std::vector<std::string> partners){
 #endif
 }
 
+[[deprecated("This method is deprecated, please replace by setSharingFilterForPartners API")]]
 void AppsFlyerX::sharingFilterForAllPartners(){
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     AppsFlyerXAndroid::sharingFilterForAllPartners();
@@ -558,3 +560,12 @@ void AppsFlyerX::setCurrentDeviceLanguage(const std::string& language) {
     return AppsFlyerXApple::setCurrentDeviceLanguage(language);
 #endif
 }
+
+void AppsFlyerX::setSharingFilterForPartners(std::vector<std::string> partners) {
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+    AppsFlyerXAndroid::setSharingFilterForPartners(partners);
+#elif (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
+    AppsFlyerXApple::setSharingFilterForPartners(partners);
+#endif
+}
+

Classes/AppsFlyer/AppsFlyerX.h

@@ -16,6 +16,7 @@
 #include "AppsFlyerXMacro.h"
 #include "AppsFlyerXDeepLinkResult.h"
 
+
 class AppsFlyerX {
 public:
 
@@ -123,8 +124,9 @@ class AppsFlyerX {
     static void setOnAppOpenAttribution(void(*callback)(cocos2d::ValueMap attributionData));
     static void setOnAppOpenAttributionFailure(void(*callback)(cocos2d::ValueMap error));
 
-    //Sharing Data filter
+    //deprecated
     static void sharingFilter(std::vector<std::string> partners);
+    //deprecated
     static void sharingFilterForAllPartners();
 
     static void waitForATTUserAuthorizationWithTimeoutInterval(double timeoutInterval);
@@ -142,6 +144,8 @@ class AppsFlyerX {
     static void setOneLinkCustomDomains(std::vector<std::string> domains);
 
     static void setCurrentDeviceLanguage(const std::string& language);
+
+    static void setSharingFilterForPartners(std::vector<std::string> partners);
 };
 #endif /* A;ppsFlyerX_h */
 

Classes/AppsFlyer/AppsFlyerXAndroid.cpp

@@ -1066,4 +1066,46 @@ void subscribeForDeepLink() {
             CCLOGERROR("%s", "'AppsFlyerLib' is not loaded");
         }
 }
+
+    void AppsFlyerXAndroid::setSharingFilterForPartners(std::vector<std::string> partners) {
+        cocos2d::JniMethodInfo jniGetInstance = getAppsFlyerInstance();
+
+        jobject afInstance = (jobject) jniGetInstance.env->CallStaticObjectMethod(
+                jniGetInstance.classID, jniGetInstance.methodID);
+
+        if (NULL != afInstance) {
+            //CCLOG("%s", "com/appsflyer/AppsFlyerLib is loaded");
+
+            jclass cls = jniGetInstance.env->GetObjectClass(afInstance);
+
+
+            cocos2d::JniMethodInfo jniGetContext;
+
+            if (!cocos2d::JniHelper::getStaticMethodInfo(jniGetContext,
+                                                         "org/cocos2dx/lib/Cocos2dxActivity",
+                                                         "getContext",
+                                                         "()Landroid/content/Context;")) {
+                return;
+            }
+
+
+            jobjectArray result;
+            result = (jobjectArray)jniGetInstance.env->NewObjectArray(partners.size(),jniGetInstance.env->FindClass("java/lang/String"),jniGetInstance.env->NewStringUTF(""));
+            for(int i=0; i<partners.size(); i++) {
+                jniGetInstance.env->SetObjectArrayElement(result,i,jniGetInstance.env->NewStringUTF(partners[i].c_str()));
+            }
+
+            jmethodID methodId = jniGetInstance.env->GetMethodID(cls, "setSharingFilterForPartners",
+                                                                 "([Ljava/lang/String;)V");
+
+
+            jniGetInstance.env->CallVoidMethod(afInstance, methodId, result);
+
+            jniGetInstance.env->DeleteLocalRef(result);
+            jniGetInstance.env->DeleteLocalRef(afInstance);
+            jniGetInstance.env->DeleteLocalRef(jniGetInstance.classID);
+        } else {
+            CCLOGERROR("%s", "'AppsFlyerLib' is not loaded");
+        }
+    }
 #endif

Classes/AppsFlyer/AppsFlyerXAndroid.h

@@ -129,6 +129,8 @@ class AppsFlyerXAndroid {
     static void setOneLinkCustomDomains(std::vector<std::string> domains);
 
     static void setDisableAdvertisingIdentifiers(bool disable);
+
+    static void setSharingFilterForPartners(std::vector<std::string> partners);
 };
 
 

Classes/AppsFlyer/AppsFlyerXApple.h

@@ -144,6 +144,8 @@ class AppsFlyerXApple {
     static void setOneLinkCustomDomains(std::vector<std::string> domains);
 
     static void setCurrentDeviceLanguage(const std::string& language);
+    
+    static void setSharingFilterForPartners(std::vector<std::string> partners);
 };
 
 #endif /* AppsFlyerXApple_h */

Classes/AppsFlyer/AppsFlyerXApple.mm

@@ -374,3 +374,11 @@ - (void)didUpdateUserActivity:(NSUserActivity *)userActivity NS_AVAILABLE_IOS(9_
 void AppsFlyerXApple::setCurrentDeviceLanguage(const std::string& language) {
     [AppsFlyerLib shared].currentDeviceLanguage = [NSString stringWithUTF8String:language.c_str()];
 }
+
+void AppsFlyerXApple::setSharingFilterForPartners(std::vector<std::string> partners) {
+    NSMutableArray *sharingFilter = [NSMutableArray new];
+    for (auto partner : partners) {
+        [sharingFilter addObject:[NSString stringWithUTF8String:partner.c_str()]];
+    }
+    [[AppsFlyerLib shared] setSharingFilterForPartners: sharingFilter];
+}

Classes/AppsFlyer/libAppsFlyer/AppsFlyerLib.h

@@ -2,7 +2,7 @@
 //  AppsFlyerLib.h
 //  AppsFlyerLib
 //
-//  AppsFlyer iOS SDK 6.3.5 (24)
+//  AppsFlyer iOS SDK 6.4.0 (29)
 //  Copyright (c) 2012-2020 AppsFlyer Ltd. All rights reserved.
 //
 
@@ -610,15 +610,26 @@ NS_SWIFT_NAME(logEvent(name:values:completionHandler:));
  Block an events from being shared with ad networks and other 3rd party integrations
  Must only include letters/digits or underscore, maximum length: 45
  */
-@property(nonatomic, nullable) NSArray<NSString *> *sharingFilter;
+@property(nonatomic, nullable) NSArray<NSString *> *sharingFilter DEPRECATED_MSG_ATTRIBUTE("starting SDK version 6.4.0, please use `setSharingFilterForAllPartners:`");
 
 @property(nonatomic) NSUInteger deepLinkTimeout;
 
 /**
  Block an events from being shared with any partner
  This method overwrite -[AppsFlyerLib setSharingFilter:]
  */
--(void)setSharingFilterForAllPartners;
+- (void)setSharingFilterForAllPartners DEPRECATED_MSG_ATTRIBUTE("starting SDK version 6.4.0, please use `setSharingFilterForAllPartners:`");
+
+/**
+ Block an events from being shared with ad networks and other 3rd party integrations
+ Must only include letters/digits or underscore, maximum length: 45
+ 
+ The sharing filter is cleared in case if `nil` or empty array passed as a parameter.
+ "all" keyword sets sharing filter for ALL partners, it is case insencitive and has highest priority
+ if passed along with another values. For example, if ["all", "examplePartner1_int", "examplePartner2_int" ] passed,
+ the sharing filter will be set for ALL partners.
+ */
+- (void)setSharingFilterForPartners:(NSArray<NSString *> * _Nullable)sharingFilter;
 
 /**
  Validate if URL contains certain string and append quiery

Classes/AppsFlyer/libAppsFlyer/libAppsFlyerLib.a

@@ -2,7 +2,7 @@
 //  AppsFlyerLib.h
 //  AppsFlyerLib
 //
-//  AppsFlyer iOS SDK 6.3.5 (24)
+//  AppsFlyer iOS SDK 6.4.0 (29)
 //  Copyright (c) 2012-2020 AppsFlyer Ltd. All rights reserved.
 //
 
@@ -610,15 +610,26 @@ NS_SWIFT_NAME(logEvent(name:values:completionHandler:));
  Block an events from being shared with ad networks and other 3rd party integrations
  Must only include letters/digits or underscore, maximum length: 45
  */
-@property(nonatomic, nullable) NSArray<NSString *> *sharingFilter;
+@property(nonatomic, nullable) NSArray<NSString *> *sharingFilter DEPRECATED_MSG_ATTRIBUTE("starting SDK version 6.4.0, please use `setSharingFilterForAllPartners:`");
 
 @property(nonatomic) NSUInteger deepLinkTimeout;
 
 /**
  Block an events from being shared with any partner
  This method overwrite -[AppsFlyerLib setSharingFilter:]
  */
--(void)setSharingFilterForAllPartners;
+- (void)setSharingFilterForAllPartners DEPRECATED_MSG_ATTRIBUTE("starting SDK version 6.4.0, please use `setSharingFilterForAllPartners:`");
+
+/**
+ Block an events from being shared with ad networks and other 3rd party integrations
+ Must only include letters/digits or underscore, maximum length: 45
+ 
+ The sharing filter is cleared in case if `nil` or empty array passed as a parameter.
+ "all" keyword sets sharing filter for ALL partners, it is case insencitive and has highest priority
+ if passed along with another values. For example, if ["all", "examplePartner1_int", "examplePartner2_int" ] passed,
+ the sharing filter will be set for ALL partners.
+ */
+- (void)setSharingFilterForPartners:(NSArray<NSString *> * _Nullable)sharingFilter;
 
 /**
  Validate if URL contains certain string and append quiery