Merge pull request #15 from adjust/v4140

Version 4.14.0

.gitmodules

@@ -1,15 +1,14 @@
-[submodule "ext/Android/sdk"]
-	path = ext/Android/sdk
-	url = git@github.com:adjust/android_sdk.git
-	branch = marmalade
 [submodule "source/rapidjson"]
 	path = source/rapidjson
 	url = git@github.com:damucz/rapidjson.git
 	branch = master
-[submodule "ext/iOS/sdk"]
-	path = ext/iOS/sdk
-	url = git@github.com:adjust/ios_sdk.git
-	branch = marmalade
 [submodule "ext/mod-pbxproj"]
 	path = ext/mod-pbxproj
 	url = git@github.com:kronenthaler/mod-pbxproj.git
+	branch = master
+[submodule "ext/android/sdk"]
+	path = ext/android/sdk
+	url = git@github.com:adjust/android_sdk.git
+[submodule "ext/ios/sdk"]
+	path = ext/ios/sdk
+	url = git@github.com:adjust/ios_sdk.git

CHANGELOG.md

@@ -1,3 +1,16 @@
+### Version 4.14.0 (17th July 2018)
+#### Added
+- Added deep link caching in case `appWillOpenUrl` method is called internally before SDK is initialised.
+
+#### Changed
+- Updated the way how iOS native bridge handles push tokens from C++ interface - they are now being passed directly as strings to native iOS SDK.
+
+#### Changed
+- Updated native iOS SDK to version **4.14.1**.
+- Updated native Android SDK to version **4.14.0**.
+
+---
+
 ### Version 4.13.0 (29th May 2018)
 #### Added
 - Added `set_app_secret` method to `adjust_config` structure.

README.md

@@ -58,7 +58,7 @@ There is an example app inside the [`example` directory][example-app]. You can u
 
 These are the minimal steps required to integrate the Adjust SDK into your Marmalade project.
 
-**Note**: SDK 4.13.0 for Marmalade is built with **Marmalade 8.8.1** and we advise you to use this Marmalade version or higher. Especially if you want to rebuild our Marmalade extension on your own.
+**Note**: SDK 4.14.0 for Marmalade is built with **Marmalade 8.8.1** and we advise you to use this Marmalade version or higher. Especially if you want to rebuild our Marmalade extension on your own.
 
 ### <a id="sdk-get"></a>Get the SDK
 

VERSION

@@ -1 +1 @@
-4.13.0
+4.14.0

doc/migrate.md

@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for Marmalade to 4.13.0 from 3.4.0
+## Migrate your adjust SDK for Marmalade to 4.14.0 from 3.4.0
 
 ### SDK initialization
 

ext/iOS/build.sh → ext/ios/build.sh

@@ -3,7 +3,7 @@
 set -e
 
 SRCDIR=./sdk
-LIBOUTDIR=../../source/sdk/iOS/
+LIBOUTDIR=../../source/sdk/ios/
 SCRIPTDIR=../../scripts/
 
 (cd $SRCDIR/Scripts; sh build.sh)

scripts/symlink_fix.sh

@@ -5,7 +5,7 @@
 set -e
 
 # Go to framework folder
-cd ../../source/sdk/iOS/AdjustSdk.framework
+cd ../../source/sdk/ios/AdjustSdk.framework
 
 # Remove any existing symlinks
 rm -rf AdjustSdk

source/AdjustMarmalade.mkf

@@ -45,7 +45,7 @@ deployments
     iphone-link-lib="AdjustMarmalade"
     iphone-link-libdir="lib/iphone"
     iphone-link-opts="-weak_framework AdSupport -weak_framework iAd -weak_framework CoreTelephony"
-    iphone-link-opts="-F$CWD/sdk/iOS -framework AdjustSdk -ObjC"
+    iphone-link-opts="-F$CWD/sdk/ios -framework AdjustSdk -ObjC"
 }
 
 #Autogenerated section for android platform support. Deleting these two comment
@@ -54,7 +54,7 @@ deployments
 deployments
 {
     android-external-jars="lib/android/AdjustMarmalade.jar"
-    android-external-jars="sdk/Android/adjust-android.jar"
+    android-external-jars="sdk/android/adjust-android.jar"
     android-so="lib/android/libAdjustMarmalade.so"
 
     android-extra-application-manifest="adjust_broadcast_receiver.xml"

source/android/AdjustMarmalade.java

@@ -50,7 +50,7 @@ protected void onNewIntent(Intent intent) {
             return;
         }
 
-        Adjust.appWillOpenUrl(uriData);
+        Adjust.appWillOpenUrl(uriData, LoaderAPI.getActivity());
 
         if (isDeeplinkCallbackSet == false) {
             return;

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.13.0");
+    config->set_sdk_prefix("marmalade4.14.0");
     return adjust_Start_platform(config);
 }
 

source/iphone/AdjustMarmalade_platform.mm

@@ -585,8 +585,7 @@ s3eResult adjust_SetReferrer_platform(const char* referrer) {
 }
 
 s3eResult adjust_SetDeviceToken_platform(const char* device_token) {
-    NSData *deviceToken = [[NSString stringWithUTF8String:device_token] dataUsingEncoding:NSUTF8StringEncoding];
-    [Adjust setDeviceToken:deviceToken];
+    [Adjust setPushToken:[NSString stringWithUTF8String:device_token]];
 
     return S3E_RESULT_SUCCESS;
 }

source/sdk/iOS/AdjustSdk.framework/Headers/Adjust.h → source/sdk/ios/AdjustSdk.framework/Headers/Adjust.h

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust
 //
-//  V4.13.0
+//  V4.14.1
 //  Created by Christian Wellenbrock (wellle) on 23rd July 2013.
 //  Copyright © 2012-2017 Adjust GmbH. All rights reserved.
 //
@@ -23,6 +23,7 @@
 @property (nonatomic, copy, nullable) NSNumber *subsessionIntervalInMilliseconds;
 @property (nonatomic, assign) BOOL teardown;
 @property (nonatomic, assign) BOOL deleteState;
+@property (nonatomic, assign) BOOL noBackoffWait;
 
 @end
 
@@ -104,10 +105,18 @@ extern NSString * __nonnull const ADJEnvironmentProduction;
 /**
  * @brief Set the device token used by push notifications.
  *
- * @param deviceToken Apple push notification token for iOS device.
+ * @param deviceToken Apple push notification token for iOS device as NSData.
  */
 + (void)setDeviceToken:(nonnull NSData *)deviceToken;
 
+/**
+ * @brief Set the device token used by push notifications.
+ *        This method is only used by Adjust non native SDKs. Don't use it anywhere else.
+ *
+ * @param pushToken Apple push notification token for iOS device as NSString.
+ */
++ (void)setPushToken:(nonnull NSString *)pushToken;
+
 /**
  * @brief Enable or disable offline mode. Activities won't be sent but they are saved when
  *        offline mode is disabled. This feature is not saved for future sessions.
@@ -233,6 +242,8 @@ extern NSString * __nonnull const ADJEnvironmentProduction;
 
 - (void)setDeviceToken:(nonnull NSData *)deviceToken;
 
+- (void)setPushToken:(nonnull NSString *)pushToken;
+
 - (void)sendFirstPackages;
 
 - (void)trackSubsessionEnd;