Merge pull request #35 from adjust/v4140

Version 4.14.0

Author: uerceg

.gitignore

@@ -99,3 +99,6 @@ package-lock.json
 
 ios/Build/
 ios/Index/
+
+# Just in case
+temp/

.gitmodules

@@ -1,8 +1,8 @@
-[submodule "ext/Android/sdk"]
-	path = ext/Android/sdk
+[submodule "ext/android/sdk"]
+	path = ext/android/sdk
 	url = [email protected]:adjust/android_sdk.git
 	branch = master
-[submodule "ext/iOS/sdk"]
-	path = ext/iOS/sdk
+[submodule "ext/ios/sdk"]
+	path = ext/ios/sdk
 	url = [email protected]:adjust/ios_sdk.git
 	branch = master

.npmignore

@@ -14,3 +14,4 @@ node_modules
 ext/
 scripts/
 example/
+test/

CHANGELOG.md

@@ -1,3 +1,17 @@
+### Version 4.14.0 (4th July 2018)
+#### Added
+- Added deep link caching in case `appWillOpenUrl` method is called before SDK is initialised.
+
+#### Changed
+- Imposed type checks when calling methods for adding callback and partner parameters - both key and value now **must** be strings.
+- Updated the way how iOS native bridge handles push tokens from React Native interface - they are now being passed directly as strings to native iOS SDK.
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.14.1]
+- [[email protected]][android_sdk_v4.14.0]
+
+---
+
 ### Version 4.13.0 (22nd May 2018)
 #### Added
 - Added `gdprForgetMe` method to `Adjust` interface to enable possibility for user to be forgotten in accordance with GDPR law.
@@ -214,6 +228,7 @@
 [ios_sdk_v4.12.1]: https://github.com/adjust/ios_sdk/tree/v4.12.1
 [ios_sdk_v4.12.3]: https://github.com/adjust/ios_sdk/tree/v4.12.3
 [ios_sdk_v4.13.0]: https://github.com/adjust/ios_sdk/tree/v4.13.0
+[ios_sdk_v4.14.1]: https://github.com/adjust/ios_sdk/tree/v4.14.1
 
 [android_sdk_v4.10.4]: https://github.com/adjust/android_sdk/tree/v4.10.4
 [android_sdk_v4.11.0]: https://github.com/adjust/android_sdk/tree/v4.11.0
@@ -226,3 +241,4 @@
 [android_sdk_v4.12.3]: https://github.com/adjust/android_sdk/tree/v4.12.3
 [android_sdk_v4.12.4]: https://github.com/adjust/android_sdk/tree/v4.12.4
 [android_sdk_v4.13.0]: https://github.com/adjust/android_sdk/tree/v4.13.0
+[android_sdk_v4.14.0]: https://github.com/adjust/android_sdk/tree/v4.14.0

LICENSE

@@ -1,6 +1,6 @@
-The adjust SDK is licensed under the MIT License.
+The Adjust SDK is licensed under the MIT License.
 
-Copyright (c) 2012-2017 adjust GmbH, http://www.adjust.com
+Copyright (c) 2012-2018 Adjust GmbH, http://www.adjust.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -363,6 +363,8 @@ It should be mentioned that we support a variety of placeholders like `{idfa}` f
 You can read more about using URL callbacks, including a full list of available values, in our
 [callbacks guide][callbacks-guide].
 
+**Note**: **Both** parameters in this method must be **strings**. If either of the passed parameters is not a string, the key-value pair will not be added to the parameters list.
+
 ### <a id="partner-parameters"></a>Partner parameters
 
 Similarly to the callback parameters mentioned above, you can also add parameters that Adjust will transmit to the network partners of your choice. You can activate these networks in your Adjust dashboard.
@@ -380,6 +382,8 @@ Adjust.trackEvent(adjustEvent);
 
 You can read more about special partners and networks in our [guide to special partners][special-partners].
 
+**Note**: **Both** parameters in this method must be **strings**. If either of the passed parameters is not a string, the key-value pair will not be added to the parameters list.
+
 ### <a id="session-parameters"></a>Session parameters
 
 Some parameters are saved to be sent in every event and session of the Adjust SDK. Once you have added any of these parameters, you don't need to add them every time, since they will be saved locally. If you add the same parameter twice, there will be no effect.
@@ -398,6 +402,8 @@ Adjust.addSessionCallbackParameter("foo", "bar");
 
 The session callback parameters will be merged with the callback parameters and added to an event. The callback parameters added to an event have precedence over the session callback parameters. Meaning that, when adding a callback parameter to an event with the same key to one added from the session, the value that prevails is the callback parameter added to the event.
 
+**Note**: **Both** parameters in this method must be **strings**. If either of the passed parameters is not a string, the key-value pair will not be added to the parameters list.
+
 It's possible to remove a specific session callback parameter by passing the desiring key to the method `removeSessionCallbackParameter` of the `Adjust` instance:
 
 ```js
@@ -424,6 +430,8 @@ Adjust.addSessionPartnerParameter("foo", "bar");
 
 The session partner parameters will be merged with the partner parameters and added to an event. The partner parameters added to an event have precedence over the session partner parameters. Meaning that, when adding a partner parameter to an event with the same key to one added from the session, the value that prevails is the partner parameter added to the event.
 
+**Note**: **Both** parameters in this method must be **strings**. If either of the passed parameters is not a string, the key-value pair will not be added to the parameters list.
+
 It's possible to remove a specific session partner parameter by passing the desiring key to the method `removeSessionPartnerParameter` of the `Adjust` instance:
 
 ```js

VERSION

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

android/libs/adjust-android.jar

@@ -2,12 +2,14 @@
 //  Adjust.java
 //  Adjust SDK
 //
-//  Created by Abdullah Obaied (@obaied) on 19th Octover 2016.
-//  Copyright (c) 2016-2018 Adjust GmbH. All rights reserved.
+//  Created by Abdullah Obaied on 2016-10-19.
+//  Copyright (c) 2018 adjust GmbH. All rights reserved.
+//  See the file MIT-LICENSE for copying permission.
 //
 
 package com.adjust.nativemodule;
 
+import android.util.Log;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Map.Entry;
@@ -34,6 +36,7 @@ public class Adjust extends ReactContextBaseJavaModule implements LifecycleEvent
     private boolean sessionTrackingFailedCallback;
     private boolean deferredDeeplinkCallback;
     private boolean shouldLaunchDeeplink = true;
+    private static String TAG = "AdjustBridge";
 
     public Adjust(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -95,37 +98,36 @@ public boolean launchReceivedDeeplink(Uri uri) {
 
     @ReactMethod
     public void create(ReadableMap mapConfig) {
-        String environment                  = null;
-        String appToken                     = null;
-        String defaultTracker               = null;
-        String processName                  = null;
-        String sdkPrefix                    = null;
-        String logLevel                     = null;
-        boolean eventBufferingEnabled       = false;
-        String userAgent                    = null;
-        long secretId                       = 0L;
-        long info1                          = 0L;
-        long info2                          = 0L;
-        long info3                          = 0L;
-        long info4                          = 0L;
-        boolean sendInBackground            = false;
-        boolean shouldLaunchDeeplink        = false;
-        double delayStart                   = 0.0;
-        boolean isLogLevelSuppress          = false;
-        boolean isDeviceKnown               = false;
+        String appToken = null;
+        String environment = null;
+        String logLevel = null;
+        String sdkPrefix = null;
+        String userAgent = null;
+        String processName = null;
+        String defaultTracker = null;
+        long secretId  = 0L;
+        long info1 = 0L;
+        long info2 = 0L;
+        long info3 = 0L;
+        long info4 = 0L;
+        double delayStart = 0.0;
+        boolean isDeviceKnown = false;
+        boolean sendInBackground = false;
+        boolean isLogLevelSuppress = false;
+        boolean shouldLaunchDeeplink = false;
+        boolean eventBufferingEnabled = false;
         boolean readMobileEquipmentIdentity = false;
 
         // Suppress log level
         if (!mapConfig.isNull("logLevel")) {
             logLevel = mapConfig.getString("logLevel");
-
             if (logLevel.equals("SUPPRESS")) {
                 isLogLevelSuppress = true;
             }
         }
 
         // App token and environment.
-        appToken    = mapConfig.getString("appToken");
+        appToken = mapConfig.getString("appToken");
         environment = mapConfig.getString("environment");
 
         final AdjustConfig adjustConfig = new AdjustConfig(getReactApplicationContext(), appToken, environment, isLogLevelSuppress);
@@ -137,7 +139,6 @@ public void create(ReadableMap mapConfig) {
         // Log level
         if (!mapConfig.isNull("logLevel")) {
             logLevel = mapConfig.getString("logLevel");
-
             if (logLevel.equals("VERBOSE")) {
                 adjustConfig.setLogLevel(LogLevel.VERBOSE);
             } else if (logLevel.equals("DEBUG")) {
@@ -158,7 +159,7 @@ public void create(ReadableMap mapConfig) {
         }
 
         // Event buffering
-        if(!mapConfig.isNull("eventBufferingEnabled")) {
+        if (!mapConfig.isNull("eventBufferingEnabled")) {
             eventBufferingEnabled = mapConfig.getBoolean("eventBufferingEnabled");
             adjustConfig.setEventBufferingEnabled(eventBufferingEnabled);
         }
@@ -272,28 +273,31 @@ public void trackEvent(ReadableMap mapEvent) {
         final String eventToken = mapEvent.getString("eventToken");
         final String currency = mapEvent.getString("currency");
         final String transactionId = mapEvent.getString("transactionId");
-        final Map<String, Object> callbackParameters  = AdjustUtil.toMap(mapEvent.getMap("callbackParameters"));
-        final Map<String, Object> partnerParameters  = AdjustUtil.toMap(mapEvent.getMap("partnerParameters"));
+        final Map<String, Object> callbackParameters = AdjustUtil.toMap(mapEvent.getMap("callbackParameters"));
+        final Map<String, Object> partnerParameters = AdjustUtil.toMap(mapEvent.getMap("partnerParameters"));
 
         AdjustEvent event = new AdjustEvent(eventToken);
-
         if (event.isValid()) {
+            // Revenue
             if (!mapEvent.isNull("revenue")) {
                 event.setRevenue(mapEvent.getDouble("revenue"), currency);
             }
 
+            // Callback parameters
             if (null != callbackParameters) {
                 for (Map.Entry<String, Object> entry : callbackParameters.entrySet()) {
                     event.addCallbackParameter(entry.getKey(), entry.getValue().toString());
                 }
             }
 
+            // Partner parameters
             if (null != partnerParameters) {
                 for (Map.Entry<String, Object> entry : partnerParameters.entrySet()) {
                     event.addPartnerParameter(entry.getKey(), entry.getValue().toString());
                 }
             }
 
+            // Revenue deduplication
             if (null != transactionId) {
                 event.setOrderId(transactionId);
             }
@@ -330,7 +334,7 @@ public void setPushToken(String token) {
     @ReactMethod
     public void appWillOpenUrl(String strUri) {
         final Uri uri = Uri.parse(strUri);
-        com.adjust.sdk.Adjust.appWillOpenUrl(uri);
+        com.adjust.sdk.Adjust.appWillOpenUrl(uri, getReactApplicationContext());
     }
 
     @ReactMethod
@@ -433,6 +437,103 @@ public void setDeferredDeeplinkCallbackListener() {
         this.deferredDeeplinkCallback = true;
     }
 
+    @ReactMethod
+    public void teardown() {
+        this.attributionCallback = false;
+        this.eventTrackingSucceededCallback = false;
+        this.eventTrackingFailedCallback = false;
+        this.sessionTrackingSucceededCallback = false;
+        this.sessionTrackingFailedCallback = false;
+        this.deferredDeeplinkCallback = false;
+    }
+
+    @ReactMethod
+    public void setTestOptions(ReadableMap map) {
+        final AdjustTestOptions testOptions = new AdjustTestOptions();
+        if (!map.isNull("hasContext")) {
+            boolean value = map.getBoolean("hasContext");
+            if (value) {
+                testOptions.context = getReactApplicationContext();
+            }
+        }
+        if (!map.isNull("baseUrl")) {
+            String value = map.getString("baseUrl");
+            testOptions.baseUrl = value;
+        }
+        if (!map.isNull("gdprUrl")) {
+            String value = map.getString("gdprUrl");
+            testOptions.gdprUrl = value;
+        }
+        if (!map.isNull("basePath")) {
+            String value = map.getString("basePath");
+            testOptions.basePath = value;
+        }
+        if (!map.isNull("gdprPath")) {
+            String value = map.getString("gdprPath");
+            testOptions.gdprPath = value;
+        }
+        if (!map.isNull("useTestConnectionOptions")) {
+            boolean value = map.getBoolean("useTestConnectionOptions");
+            testOptions.useTestConnectionOptions = value;
+        }
+        if (!map.isNull("timerIntervalInMilliseconds")) {
+            try {
+                Long value = Long.parseLong(map.getString("timerIntervalInMilliseconds"));
+                testOptions.timerIntervalInMilliseconds = value;
+            } catch (NumberFormatException ex) {
+                ex.printStackTrace();
+                Log.d(TAG, "Can't format number");
+            }
+        }
+        if (!map.isNull("timerStartInMilliseconds")) {
+            try {
+                Long value = Long.parseLong(map.getString("timerStartInMilliseconds"));
+                testOptions.timerStartInMilliseconds = value;
+            } catch (NumberFormatException ex) {
+                ex.printStackTrace();
+                Log.d(TAG, "Can't format number");
+            }
+        }
+        if (!map.isNull("sessionIntervalInMilliseconds")) {
+            try {
+                Long value = Long.parseLong(map.getString("sessionIntervalInMilliseconds"));
+                testOptions.sessionIntervalInMilliseconds = value;
+            } catch (NumberFormatException ex) {
+                ex.printStackTrace();
+                Log.d(TAG, "Can't format number");
+            }
+        }
+        if (!map.isNull("subsessionIntervalInMilliseconds")) {
+            try {
+                Long value = Long.parseLong(map.getString("subsessionIntervalInMilliseconds"));
+                testOptions.subsessionIntervalInMilliseconds = value;
+            } catch (NumberFormatException ex) {
+                ex.printStackTrace();
+                Log.d(TAG, "Can't format number");
+            }
+        }
+        if (!map.isNull("noBackoffWait")) {
+            boolean value = map.getBoolean("noBackoffWait");
+            testOptions.noBackoffWait = value;
+        }
+        if (!map.isNull("teardown")) {
+            boolean value = map.getBoolean("teardown");
+            testOptions.teardown = value;
+        }
+
+        com.adjust.sdk.Adjust.setTestOptions(testOptions);
+    }
+
+    @ReactMethod
+    public void onResume() {
+        com.adjust.sdk.Adjust.onResume();
+    }
+
+    @ReactMethod
+    public void onPause() {
+        com.adjust.sdk.Adjust.onPause();
+    }
+
     private void sendEvent(ReactContext reactContext, String eventName, @Nullable WritableMap params) {
         reactContext
             .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)

android/src/main/java/com/adjust/sdk/Adjust.java

@@ -2,8 +2,9 @@
 //  AdjustPackage.java
 //  Adjust SDK
 //
-//  Created by Abdullah Obaied (@obaied) on 19th Octover 2016.
-//  Copyright (c) 2016-2018 Adjust GmbH. All rights reserved.
+//  Created by Abdullah Obaied on 2016-10-19.
+//  Copyright (c) 2018 adjust GmbH. All rights reserved.
+//  See the file MIT-LICENSE for copying permission.
 //
 
 package com.adjust.nativemodule;

android/src/main/java/com/adjust/sdk/AdjustPackage.java

@@ -1,9 +1,10 @@
 //
 //  AdjustUtil.java
-//  Adjust SDK
+//  Adjust
 //
-//  Created by Abdullah Obaied (@obaied) on 19th Octover 2016.
-//  Copyright (c) 2016-2018 Adjust GmbH. All rights reserved.
+//  Created by Abdullah Obaied on 2016-10-19.
+//  Copyright (c) 2018 adjust GmbH. All rights reserved.
+//  See the file MIT-LICENSE for copying permission.
 //
 
 package com.adjust.nativemodule;