Merge pull request #66 from adjust/v4180

Version 4.18.0

Author: uerceg

.gitignore

@@ -33,7 +33,6 @@ Pods
 # built application files
 *.apk
 *.ap_
-*.jar
 
 # lint folder
 lint

CHANGELOG.md

@@ -1,3 +1,14 @@
+### Version 4.18.0 (1st July 2019)
+#### Added
+- Added `trackAdRevenue` method to `Adjust` interface to allow tracking of ad revenue. With this release added support for `MoPub` ad revenue tracking.
+- Added reading of Facebook anonymous ID if available on iOS platform.
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.18.0]
+- [[email protected]][android_sdk_v4.18.0]
+
+---
+
 ### Version 4.17.2 (3rd May 2019)
 #### Changed
 - Updated iOS SDK version number in Podspec file to 4.17.2.
@@ -282,6 +293,7 @@
 [ios_sdk_v4.15.0]: https://github.com/adjust/ios_sdk/tree/v4.15.0
 [ios_sdk_v4.17.1]: https://github.com/adjust/ios_sdk/tree/v4.17.1
 [ios_sdk_v4.17.2]: https://github.com/adjust/ios_sdk/tree/v4.17.2
+[ios_sdk_v4.18.0]: https://github.com/adjust/ios_sdk/tree/v4.18.0
 
 [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
@@ -297,3 +309,4 @@
 [android_sdk_v4.14.0]: https://github.com/adjust/android_sdk/tree/v4.14.0
 [android_sdk_v4.15.0]: https://github.com/adjust/android_sdk/tree/v4.15.0
 [android_sdk_v4.17.0]: https://github.com/adjust/android_sdk/tree/v4.17.0
+[android_sdk_v4.18.0]: https://github.com/adjust/android_sdk/tree/v4.18.0

VERSION

@@ -1 +1 @@
-4.17.2
+4.18.0

android/libs/adjust-android.jar

@@ -14,6 +14,8 @@
 import java.util.HashMap;
 import java.util.Map.Entry;
 import javax.annotation.Nullable;
+import org.json.JSONObject;
+import org.json.JSONException;
 import com.facebook.react.bridge.*;
 import com.facebook.react.modules.core.*;
 import com.adjust.sdk.*;
@@ -382,6 +384,16 @@ public void sendFirstPackages() {
         com.adjust.sdk.Adjust.sendFirstPackages();
     }
 
+    @ReactMethod
+    public void trackAdRevenue(String source, String payload) {
+        try {
+            JSONObject jsonPayload = new JSONObject(payload);
+            com.adjust.sdk.Adjust.trackAdRevenue(source, jsonPayload);
+        }catch (JSONException err){
+             Log.d(TAG, "Give ad revenue payload is not a valid JSON string");
+        }
+    }
+
     @ReactMethod
     public void addSessionCallbackParameter(String key, String value) {
         com.adjust.sdk.Adjust.addSessionCallbackParameter(key, value);

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

@@ -158,6 +158,7 @@ declare module "react-native-adjust" {
         setPushToken: (token: string): void => { },
         appWillOpenUrl: (url: string): void => { },
         sendFirstPackages: (): void => { },
+        trackAdRevenue: (source: string, payload: string): void => { },
         addSessionCallbackParameter: (key: string, value: string): void => { },
         addSessionPartnerParameter: (key: string, value: string): void => { },
         removeSessionCallbackParameter: (key: string): void => { },

ext/android/sdk

@@ -51,6 +51,10 @@ Adjust.sendFirstPackages = function() {
     module_adjust.sendFirstPackages();
 };
 
+Adjust.trackAdRevenue = function(source, payload) {
+    module_adjust.trackAdRevenue(source, payload);
+}
+
 Adjust.addSessionCallbackParameter = function(key, value) {
     if (typeof key !== 'string' || typeof value !== 'string') {
         return;
@@ -106,7 +110,7 @@ Adjust.getAmazonAdId = function(callback) {
 };
 
 Adjust.getSdkVersion = function(callback) {
-    module_adjust.getSdkVersion("react-native4.17.2", callback);
+    module_adjust.getSdkVersion("react-native4.18.0", callback);
 }
 
 Adjust.setReferrer = function(referrer) {
@@ -179,7 +183,7 @@ Adjust.onPause = function(testParam) {
 // AdjustConfig
 
 var AdjustConfig = function(appToken, environment) {
-    this.sdkPrefix = "react-native4.17.2";
+    this.sdkPrefix = "react-native4.18.0";
     this.appToken = appToken;
     this.environment = environment;
     this.logLevel = null;

ext/ios/sdk

@@ -96,6 +96,7 @@
 - (void)removeSessionPartnerParameter:(NSString *)key;
 - (void)resetSessionCallbackParameters;
 - (void)resetSessionPartnerParameters;
+- (void)trackAdRevenue:(NSString *)soruce payload:(NSData *)payload;
 - (NSString *)getBasePath;
 - (NSString *)getGdprPath;