Merge pull request #14 from adjust/v4130

Version 4.13.0
adjust · May 29, 2018 · 38becfa · 38becfa
2 parents 77117c4 + 0f1cc94
commit 38becfa
Show file tree

Hide file tree

Showing 31 changed files with 1,016 additions and 437 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+### Version 4.13.0 (29th May 2018)
+#### Added
+- Added `set_app_secret` method to `adjust_config` structure.
+- Added `adjust_GdprForgetMe()` method to enable possibility for user to be forgotten in accordance with GDPR law.
+
+#### Fixed
+- Fixed issue of creating and destroying lots of threads on certain Android API levels (https://github.com/adjust/android_sdk/issues/265).
+
+#### Changed
+- Updated native iOS SDK to version **4.13.0**.
+- Updated native Android SDK to version **4.13.0**.
+
+---
+
 ### Version 4.11.0 (10th February 2017)
 #### Added
 - Added `adid` property to the attribution callback response.

diff --git a/README.md b/README.md
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.11.0
+4.13.0
diff --git a/adjust/AdjustMarmalade.s4e b/adjust/AdjustMarmalade.s4e
@@ -120,6 +120,11 @@ struct adjust_event {
 
 struct adjust_config {
     double* delay_start;
+    double* secret_id;
+    double* info_1;
+    double* info_2;
+    double* info_3;
+    double* info_4;
     const char* app_token;
     const char* environment;
     const char* log_level;
@@ -151,6 +156,11 @@ struct adjust_config {
 
     adjust_config() {
         delay_start = NULL;
+        secret_id = NULL;
+        info_1 = NULL;
+        info_2 = NULL;
+        info_3 = NULL;
+        info_4 = NULL;
         app_token = NULL;
         environment = NULL;
         log_level = NULL;
@@ -174,6 +184,11 @@ struct adjust_config {
 
     adjust_config(const char* p_app_token, const char* p_environment) {
         delay_start = NULL;
+        secret_id = NULL;
+        info_1 = NULL;
+        info_2 = NULL;
+        info_3 = NULL;
+        info_4 = NULL;
         app_token = p_app_token;
         environment = p_environment;
         log_level = NULL;
@@ -200,6 +215,19 @@ struct adjust_config {
         *delay_start = p_delay_start;
     }
 
+    void set_app_secret(double p_secret_id, double p_info_1, double p_info_2, double p_info_3, double p_info_4) {
+        secret_id = new double();
+        *secret_id = p_secret_id;
+        info_1 = new double();
+        *info_1 = p_info_1;
+        info_2 = new double();
+        *info_2 = p_info_2;
+        info_3 = new double();
+        *info_3 = p_info_3;
+        info_4 = new double();
+        *info_4 = p_info_4;
+    }
+
     void set_log_level(const char* p_log_level) {
         log_level = p_log_level;
     }
@@ -305,6 +333,7 @@ s3eResult adjust_RemoveSessionCallbackParameter(const char* key) S3E_RESULT_ERRO
 s3eResult adjust_RemoveSessionPartnerParameter(const char* key) S3E_RESULT_ERROR
 s3eResult adjust_ResetSessionCallbackParameters() S3E_RESULT_ERROR
 s3eResult adjust_ResetSessionPartnerParameters() S3E_RESULT_ERROR
+s3eResult adjust_GdprForgetMe() S3E_RESULT_ERROR
 s3eResult adjust_GetGoogleAdId() S3E_RESULT_ERROR
 s3eResult adjust_GetIdfa() S3E_RESULT_ERROR
 s3eResult adjust_GetAdid(char** adid) S3E_RESULT_ERROR

diff --git a/doc/migrate.md b/doc/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for Marmalade to 4.11.0 from 3.4.0
+## Migrate your adjust SDK for Marmalade to 4.13.0 from 3.4.0
 
 ### SDK initialization
 

diff --git a/ext/Android/sdk b/ext/Android/sdk
diff --git a/ext/iOS/build.sh b/ext/iOS/build.sh
@@ -6,7 +6,7 @@ SRCDIR=./sdk
 LIBOUTDIR=../../source/sdk/iOS/
 SCRIPTDIR=../../scripts/
 
-(cd $SRCDIR/Scripts; sh adjust_build.sh)
+(cd $SRCDIR/Scripts; sh build.sh)
 
 rm -v -rf $LIBOUTDIR/AdjustSdk.framework
 cp -v -R $SRCDIR/Frameworks/Static/AdjustSdk.framework $LIBOUTDIR

diff --git a/ext/iOS/sdk b/ext/iOS/sdk
diff --git a/scripts/build.py b/scripts/build.py
@@ -49,7 +49,7 @@ def main():
                     build_android()
                 if not parsed_args.build_android:
                     compile_android()
-                    post_compile()
+                    # post_compile()
 
 def LogInput(writeObject):
     def Log(message, *args):
@@ -100,21 +100,25 @@ def build_iphone():
     #edit_build_iphone_mkf()
 
 def compile_android():
-    mkb_android_java = Popen(["mkb", "../adjust/AdjustMarmalade_android_java.mkb"], stdout=PIPE, stderr=PIPE)
+    mkb_android_java = Popen(["mkb", "../adjust/AdjustMarmalade_android_java.mkb", "--verbose=10"], stdout=PIPE, stderr=PIPE)
     out, err = mkb_android_java.communicate()
 
+    Log("----------")
     Log("mkb android java out: {0}".format(out))
     if (mkb_android_java.returncode not in [0]):
         print("mkb android java code: {0}, err: {1}".format(
             mkb_android_java.returncode, err))
+    Log("----------")
 
-    mkb_android = Popen(["mkb", "../adjust/AdjustMarmalade_android.mkb"], stdout=PIPE, stderr=PIPE)
+    mkb_android = Popen(["mkb", "../adjust/AdjustMarmalade_android.mkb", "--verbose=10"], stdout=PIPE, stderr=PIPE)
     out, err = mkb_android.communicate()
 
+    Log("----------")
     Log("mkb android out: {0}".format(out))
     if (mkb_android.returncode not in [0]):
         print("mkb android code: {0}, err: {1}".format(
             mkb_android.returncode, err))
+    Log("----------")
 
 def compile_iphone():
     #mkb_iphone = Popen(["mkb", "adjust/AdjustMarmalade_iphone.mkb", "--buildenv=scons"],
@@ -218,13 +222,15 @@ def move_iphone_source():
     Log("Copied iPhone source files!")
 
 def post_compile():
+    Log("Doing post_compile()!")
     shutil.copy("../source/interface/AdjustMarmalade_interface.cpp", "../adjust/interface/AdjustMarmalade_interface.cpp")
 
 def edit_android_mkb():
     mkb_filename = "../adjust/AdjustMarmalade_android.mkb"
 
     with open(mkb_filename, "a") as f:
         f.write("subproject rapidjson")
+    Log("Added rapidjson subproject to android mkb")
 
 def edit_android_java_mkb():
     mkb_file_lines = []
@@ -236,7 +242,7 @@ def edit_android_java_mkb():
             mkb_file_lines.append(line)
             if librarypath_re.search(line):
                 mkb_file_lines.append("librarypath \"sdk/Android/adjust-android.jar\"\n")
-                Log("Pppend native SDK jar to android java mkb")
+                Log("Append native SDK jar to android java mkb")
     with open(mkb_filename, "w+") as f:
         f.writelines(mkb_file_lines)
 
@@ -250,7 +256,7 @@ def edit_mkf(platform):
         for line in f:
             mkf_file_lines.append(line)
             if platform == "iphone" and iphone_links_opts.search(line):
-                mkf_file_lines.append("    iphone-link-opts=\"-weak_framework iAd\" -weak_framework AdSupport\"\n")
+                mkf_file_lines.append("    iphone-link-opts=\"-weak_framework iAd\" -weak_framework AdSupport\" -weak_framework CoreTelephony\"\n")
                 Log("append iphone weak frameworks to mkf")
             if platform == "android" and external_jar_re.search(line):
                 mkf_file_lines.append("    android-external-jars=\"incoming/adjust.jar\"\n")
@@ -288,14 +294,18 @@ def edit_xcode_project(xcode_project_path):
     # Load iOS pbxproj project file.
     ios_XcodeProject = XcodeProject.Load(xcode_project_path)
 
-    # Add adSupport framework.
+    # Add AdSupport framework.
     ios_XcodeProject.add_file_if_doesnt_exist(framework_path + "AdSupport.framework", tree="SDKROOT", create_build_files=True, weak=True)
     Log("Added adSupport framework")
 
     # Add iAd framework.
     ios_XcodeProject.add_file_if_doesnt_exist(framework_path + "iAd.framework", tree="SDKROOT", create_build_files=True, weak=True)
     Log("Added iAd framework")
 
+    # Add CoreTelephony framework.
+    ios_XcodeProject.add_file_if_doesnt_exist(framework_path + "CoreTelephony.framework", tree="SDKROOT", create_build_files=True, weak=True)
+    Log("Added CoreTelephony framework")
+
     # Add Adjust framework.
     adjust_framework_path = os.path.dirname(os.path.abspath(__file__)) + "../adjust/sdk/ios/"
     ios_XcodeProject.add_file_if_doesnt_exist(adjust_framework_path + "AdjustSdk.framework", tree="SDKROOT", create_build_files=True, weak=True)

diff --git a/source/AdjustMarmalade.mkf b/source/AdjustMarmalade.mkf
@@ -44,7 +44,7 @@ deployments
     #iphone-link-opts="-framework X" #Use this to bring in any additional link options needed
     iphone-link-lib="AdjustMarmalade"
     iphone-link-libdir="lib/iphone"
-    iphone-link-opts="-weak_framework AdSupport -weak_framework iAd"
+    iphone-link-opts="-weak_framework AdSupport -weak_framework iAd -weak_framework CoreTelephony"
     iphone-link-opts="-F$CWD/sdk/iOS -framework AdjustSdk -ObjC"
 }
 

diff --git a/source/adjust_broadcast_receiver.xml b/source/adjust_broadcast_receiver.xml
@@ -1,4 +1,5 @@
-<receiver android:name="com.adjust.sdk.AdjustReferrerReceiver" 
+<receiver android:name="com.adjust.sdk.AdjustReferrerReceiver"
+	      android:permission="android.permission.INSTALL_PACKAGES"
           android:exported="true" >
     <intent-filter>
         <action android:name="com.android.vending.INSTALL_REFERRER" />

diff --git a/source/adjust_permissions.xml b/source/adjust_permissions.xml
@@ -1,3 +1,4 @@
 <uses-permission android:name="android.permission.INTERNET"/>
 <!-- ACCESS_WIFI_STATE is not needed if your app is using Google Play Services library -->
 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/source/android/AdjustMarmalade.java b/source/android/AdjustMarmalade.java
@@ -76,6 +76,11 @@ public void adjust_Start(String appToken,
         String logLevel,
         String sdkPrefix,
         double delayStart,
+        double secretId,
+        double info1,
+        double info2,
+        double info3,
+        double info4,
         boolean isEventBufferingEnabled,
         boolean isSendingInBackgroundEnabled,
         boolean shouldDeferredDeeplinkBeOpened,
@@ -140,6 +145,10 @@ public void adjust_Start(String appToken,
                 adjustConfig.setDelayStart(delayStart);
             }
 
+            if (secretId != -1 && info1 != -1 && info2 != -1 && info3 != -1 && info4 != -1) {
+                adjustConfig.setAppSecret((long)secretId, (long)info1, (long)info2, (long)info3, (long)info4);
+            }
+
             if (isAttributionCallbackSet) {
                 adjustConfig.setOnAttributionChangedListener(this);    
             }
@@ -221,11 +230,11 @@ public void adjust_SetOfflineMode(boolean isEnabled) {
     }
 
     public void adjust_SetReferrer(String referrer) {
-        Adjust.setReferrer(referrer);
+        Adjust.setReferrer(referrer, LoaderAPI.getActivity());
     }
 
     public void adjust_SetDeviceToken(String deviceToken) {
-        Adjust.setPushToken(deviceToken);
+        Adjust.setPushToken(deviceToken, LoaderAPI.getActivity());
     }
 
     public void adjust_SendFirstPackages() {
@@ -251,10 +260,15 @@ public void adjust_RemoveSessionPartnerParameter(String key) {
     public void adjust_ResetSessionCallbackParameters() {
         Adjust.resetSessionCallbackParameters();
     }
+
     public void adjust_ResetSessionPartnerParameters() {
         Adjust.resetSessionPartnerParameters();
     }
 
+    public void adjust_GdprForgetMe() {
+        Adjust.gdprForgetMe(LoaderAPI.getActivity());
+    }
+
     public void adjust_GetGoogleAdId() {
         if (this.isGoogleAdIdCallbackSet) {
             Adjust.getGoogleAdId(LoaderAPI.getActivity(), new OnDeviceIdsRead() {

diff --git a/source/android/AdjustMarmalade_platform.cpp b/source/android/AdjustMarmalade_platform.cpp
@@ -20,6 +20,7 @@ static jmethodID g_adjust_TrackEvent;
 static jmethodID g_adjust_SetEnabled;
 static jmethodID g_adjust_IsEnabled;
 static jmethodID g_adjust_SetOfflineMode;
+static jmethodID g_adjust_SetReferrer;
 static jmethodID g_adjust_SetDeviceToken;
 static jmethodID g_adjust_SendFirstPackages;
 static jmethodID g_adjust_AddSessionCallbackParameter;
@@ -28,13 +29,13 @@ static jmethodID g_adjust_RemoveSessionCallbackParameter;
 static jmethodID g_adjust_RemoveSessionPartnerParameter;
 static jmethodID g_adjust_ResetSessionCallbackParameters;
 static jmethodID g_adjust_ResetSessionPartnerParameters;
-static jmethodID g_adjust_OnPause;
-static jmethodID g_adjust_OnResume;
-static jmethodID g_adjust_SetReferrer;
+static jmethodID g_adjust_GdprForgetMe;
 static jmethodID g_adjust_GetGoogleAdId;
 static jmethodID g_adjust_GetIdfa;
 static jmethodID g_adjust_GetAdid;
 static jmethodID g_adjust_GetAttribution;
+static jmethodID g_adjust_OnPause;
+static jmethodID g_adjust_OnResume;
 
 char* get_json_string(rapidjson::Document &jsonDoc, const char* member_name) {
     if (!jsonDoc.HasMember(member_name)) {
@@ -343,7 +344,7 @@ s3eResult AdjustMarmaladeInit_platform() {
     }
 
     // Get all the extension methods.
-    g_adjust_Start = env->GetMethodID(cls, "adjust_Start", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DZZZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZZZZZZZZ)V");
+    g_adjust_Start = env->GetMethodID(cls, "adjust_Start", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DDDDDDZZZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZZZZZZZZ)V");
 
     if (!g_adjust_Start) {
         goto fail;
@@ -427,6 +428,12 @@ s3eResult AdjustMarmaladeInit_platform() {
         goto fail;
     }
 
+    g_adjust_GdprForgetMe = env->GetMethodID(cls, "adjust_GdprForgetMe", "()V");
+
+    if (!g_adjust_GdprForgetMe) {
+        goto fail;
+    }
+
     g_adjust_GetGoogleAdId = env->GetMethodID(cls, "adjust_GetGoogleAdId", "()V");
 
     if (!g_adjust_GetGoogleAdId) {
@@ -510,6 +517,11 @@ s3eResult adjust_Start_platform(adjust_config* config) {
     jboolean jIsGoogleAdIdCallbackSet = JNI_FALSE;
     jboolean jIsIdfaCallbackSet = JNI_FALSE;
     jdouble jDelayStart = config->delay_start != NULL ? *(config->delay_start) : -1;
+    jdouble jSecretId = config->secret_id != NULL ? *(config->secret_id) : -1;
+    jdouble jInfo1 = config->info_1 != NULL ? *(config->info_1) : -1;
+    jdouble jInfo2 = config->info_2 != NULL ? *(config->info_2) : -1;
+    jdouble jInfo3 = config->info_3 != NULL ? *(config->info_3) : -1;
+    jdouble jInfo4 = config->info_4 != NULL ? *(config->info_4) : -1;
 
     if (config->is_event_buffering_enabled != NULL) {
         jIsEventBufferingEnabled = (jboolean)(*(config->is_event_buffering_enabled));
@@ -602,6 +614,11 @@ s3eResult adjust_Start_platform(adjust_config* config) {
         jLogLevel,
         jSdkPrefix, 
         jDelayStart,
+        jSecretId,
+        jInfo1,
+        jInfo2,
+        jInfo3,
+        jInfo4,
         jIsEventBufferingEnabled,
         jIsSendingInBackgroundEnabled,
         jShouldDeferredDeeplinkBeOpened,
@@ -774,6 +791,7 @@ s3eResult adjust_ResetSessionCallbackParameters_platform() {
 
     return (s3eResult)0;
 }
+
 s3eResult adjust_ResetSessionPartnerParameters_platform() {
     JNIEnv* env = s3eEdkJNIGetEnv();
 
@@ -782,6 +800,14 @@ s3eResult adjust_ResetSessionPartnerParameters_platform() {
     return (s3eResult)0;
 }
 
+s3eResult adjust_GdprForgetMe_platform() {
+    JNIEnv* env = s3eEdkJNIGetEnv();
+
+    env->CallVoidMethod(g_Obj, g_adjust_GdprForgetMe);
+
+    return (s3eResult)0;
+}
+
 s3eResult adjust_GetGoogleAdId_platform() {
     JNIEnv* env = s3eEdkJNIGetEnv();
     env->CallVoidMethod(g_Obj, g_adjust_GetGoogleAdId);

diff --git a/source/generic/AdjustMarmalade.cpp b/source/generic/AdjustMarmalade.cpp
@@ -121,7 +121,7 @@ char* adjust_CopyString(const char* source) {
 }
 
 s3eResult adjust_Start(adjust_config* config) {
-    config->set_sdk_prefix("marmalade4.11.0");
+    config->set_sdk_prefix("marmalade4.13.0");
     return adjust_Start_platform(config);
 }
 
@@ -172,10 +172,15 @@ s3eResult adjust_RemoveSessionPartnerParameter(const char* key) {
 s3eResult adjust_ResetSessionCallbackParameters() {
     return adjust_ResetSessionCallbackParameters_platform();
 }
+
 s3eResult adjust_ResetSessionPartnerParameters() {
     return adjust_ResetSessionPartnerParameters_platform();
 }
 
+s3eResult adjust_GdprForgetMe() {
+    return adjust_GdprForgetMe_platform();
+}
+
 s3eResult adjust_GetGoogleAdId() {
     return adjust_GetGoogleAdId_platform();
 }