Version 4.18.0

.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

README.md

@@ -127,11 +127,12 @@ You should use the following import statement on top of your `.js` file
 import { Adjust, AdjustEvent, AdjustConfig } from 'react-native-adjust';
 ```
 
-In your `index.android.js` or `index.ios.js` file, add the following code to initialize the Adjust SDK:
+In your `App.js` file, add the following code to initialize the Adjust SDK:
 
 ```javascript
-componentWillMount() {
-    var adjustConfig = new AdjustConfig("{YourAppToken}", AdjustConfig.EnvironmentSandbox);
+constructor(props) {
+    super(props);
+    const adjustConfig = new AdjustConfig("{YourAppToken}", AdjustConfig.EnvironmentSandbox);
     Adjust.create(adjustConfig);
 }
 

VERSION

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

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

@@ -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);

example/App.js

@@ -4,16 +4,9 @@
 
   type Props = {};
   export default class App extends Component<Props> {
-    componentDidMount() {
-      Linking.addEventListener('url', this.handleDeepLink);
-      Linking.getInitialURL().then((url) => {
-        if (url) {
-          this.handleDeepLink({ url });
-        }
-      })
-    }
+    constructor(props) {
+      super(props);
 
-    componentWillMount() {
       this._onPress_trackSimpleEvent   = this._onPress_trackSimpleEvent.bind(this);
       this._onPress_trackRevenueEvent  = this._onPress_trackRevenueEvent.bind(this);
       this._onPress_trackCallbackEvent = this._onPress_trackCallbackEvent.bind(this);
@@ -29,7 +22,7 @@
         console.log("Adjust SDK version: " + sdkVersion);
       });
 
-      var adjustConfig = new AdjustConfig("2fm9gkqubvpc", AdjustConfig.EnvironmentSandbox);
+      const adjustConfig = new AdjustConfig("2fm9gkqubvpc", AdjustConfig.EnvironmentSandbox);
       adjustConfig.setLogLevel(AdjustConfig.LogLevelVerbose);
       adjustConfig.setShouldLaunchDeeplink(true);
       adjustConfig.setSendInBackground(true);
@@ -116,6 +109,15 @@
       // Adjust.sendFirstPackages();
     }
 
+    componentDidMount() {
+      Linking.addEventListener('url', this.handleDeepLink);
+      Linking.getInitialURL().then((url) => {
+        if (url) {
+          this.handleDeepLink({ url });
+        }
+      })
+    }
+
     componentWillUnmount() {
       Adjust.componentWillUnmount();
       Linking.removeEventListener('url', this.handleDeepLink);

index.d.ts

@@ -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 => { },

index.js

@@ -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;

ios/Adjust/ADJActivityHandler.h

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

ios/Adjust/ADJActivityHandler.m

@@ -565,6 +565,14 @@ - (void)resetSessionPartnerParameters {
                      }];
 }
 
+- (void)trackAdRevenue:(NSString *)source payload:(NSData *)payload {
+    [ADJUtil launchInQueue:self.internalQueue
+                selfInject:self
+                     block:^(ADJActivityHandler * selfI) {
+                         [selfI adRevenueI:selfI source:source payload:payload];
+                     }];
+}
+
 - (NSString *)getBasePath {
     return _basePath;
 }
@@ -939,6 +947,32 @@ - (void)eventI:(ADJActivityHandler *)selfI
     [selfI writeActivityStateI:selfI];
 }
 
+- (void)adRevenueI:(ADJActivityHandler *)selfI
+            source:(NSString *)source
+           payload:(NSData *)payload {
+    if (!selfI.activityState) {
+        return;
+    }
+    if (![selfI isEnabledI:selfI]) {
+        return;
+    }
+    if (selfI.activityState.isGdprForgotten) {
+        return;
+    }
+
+    double now = [NSDate.date timeIntervalSince1970];
+
+    // Create and submit ad revenue package.
+    ADJPackageBuilder *adRevenueBuilder = [[ADJPackageBuilder alloc] initWithDeviceInfo:selfI.deviceInfo
+                                                                          activityState:selfI.activityState
+                                                                                 config:selfI.adjustConfig
+                                                                      sessionParameters:selfI.sessionParameters
+                                                                              createdAt:now];
+    ADJActivityPackage *adRevenuePackage = [adRevenueBuilder buildAdRevenuePackage:source payload:payload];
+    [selfI.packageHandler addPackage:adRevenuePackage];
+    [selfI.packageHandler sendFirstPackage];
+}
+
 - (void)launchEventResponseTasksI:(ADJActivityHandler *)selfI
                 eventResponseData:(ADJEventResponseData *)eventResponseData {
     [selfI updateAdidI:selfI adid:eventResponseData.adid];
@@ -1158,6 +1192,7 @@ - (void)setEnabledI:(ADJActivityHandler *)selfI enabled:(BOOL)enabled {
         if ([ADJUserDefaults getGdprForgetMe]) {
             [selfI setGdprForgetMe];
         }
+        [[UIDevice currentDevice] adjSetIad:selfI triesV3Left:kTryIadV3];
     }
 
     [selfI checkStatusI:selfI

ios/Adjust/ADJActivityKind.h

@@ -13,14 +13,15 @@
 #endif
 
 typedef NS_ENUM(int, ADJActivityKind) {
-    ADJActivityKindUnknown       = 0,
-    ADJActivityKindSession       = 1,
-    ADJActivityKindEvent         = 2,
-//  ADJActivityKindRevenue       = 3,
-    ADJActivityKindClick         = 4,
-    ADJActivityKindAttribution   = 5,
-    ADJActivityKindInfo          = 6,
-    ADJActivityKindGdpr          = 7
+    ADJActivityKindUnknown      = 0,
+    ADJActivityKindSession      = 1,
+    ADJActivityKindEvent        = 2,
+//  ADJActivityKindRevenue      = 3,
+    ADJActivityKindClick        = 4,
+    ADJActivityKindAttribution  = 5,
+    ADJActivityKindInfo         = 6,
+    ADJActivityKindGdpr         = 7,
+    ADJActivityKindAdRevenue    = 8
 };
 
 @interface ADJActivityKindUtil : NSObject

ios/Adjust/ADJActivityKind.m

@@ -25,6 +25,8 @@ + (ADJActivityKind)activityKindFromString:(NSString *)activityKindString {
         return ADJActivityKindInfo;
     } else if ([@"gdpr" isEqualToString:activityKindString]) {
         return ADJActivityKindGdpr;
+    } else if ([@"ad_revenue" isEqualToString:activityKindString]) {
+        return ADJActivityKindAdRevenue;
     } else {
         return ADJActivityKindUnknown;
     }
@@ -44,6 +46,8 @@ + (NSString *)activityKindToString:(ADJActivityKind)activityKind {
             return @"info";
         case ADJActivityKindGdpr:
             return @"gdpr";
+        case ADJActivityKindAdRevenue:
+            return @"ad_revenue";
         default:
             return @"unknown";
     }

ios/Adjust/ADJAdditions/UIDevice+ADJAdditions.h

@@ -14,6 +14,7 @@
 
 - (BOOL)adjTrackingEnabled;
 - (NSString *)adjIdForAdvertisers;
+- (NSString *)adjFbAnonymousId;
 - (NSString *)adjFbAttributionId;
 - (NSString *)adjDeviceType;
 - (NSString *)adjDeviceName;

ios/Adjust/ADJAdditions/UIDevice+ADJAdditions.m

@@ -108,6 +108,27 @@ - (NSString *)adjFbAttributionId {
 #endif
 }
 
+- (NSString *)adjFbAnonymousId {
+#if TARGET_OS_TV
+    return @"";
+#else
+    // return [FBSDKAppEventsUtility retrievePersistedAnonymousID];
+    Class class = NSClassFromString(@"FBSDKAppEventsUtility");
+    if (class == nil) {
+        return @"";
+    }
+    SEL selGetId = NSSelectorFromString(@"retrievePersistedAnonymousID");
+    if (![class respondsToSelector:selGetId]) {
+        return @"";
+    }
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+    NSString *fbAnonymousId = (NSString *)[class performSelector:selGetId];
+#pragma clang diagnostic pop
+    return fbAnonymousId;
+#endif
+}
+
 - (NSString *)adjDeviceType {
     NSString *type = [self.model stringByReplacingOccurrencesOfString:@" " withString:@""];
     return type;

ios/Adjust/ADJDeviceInfo.h

@@ -11,6 +11,7 @@
 @interface ADJDeviceInfo : NSObject
 
 @property (nonatomic, copy) NSString *idForAdvertisers;
+@property (nonatomic, copy) NSString *fbAnonymousId;
 @property (nonatomic, copy) NSString *fbAttributionId;
 @property (nonatomic, assign) BOOL trackingEnabled;
 @property (nonatomic, copy) NSString *vendorId;

ios/Adjust/ADJDeviceInfo.m

@@ -36,6 +36,7 @@ - (id)initWithSdkPrefix:(NSString *)sdkPrefix {
 
     self.trackingEnabled  = UIDevice.currentDevice.adjTrackingEnabled;
     self.idForAdvertisers = UIDevice.currentDevice.adjIdForAdvertisers;
+    self.fbAnonymousId    = UIDevice.currentDevice.adjFbAnonymousId;
     self.fbAttributionId  = UIDevice.currentDevice.adjFbAttributionId;
     self.vendorId         = UIDevice.currentDevice.adjVendorId;
     self.bundeIdentifier  = [infoDictionary objectForKey:(NSString *)kCFBundleIdentifierKey];

ios/Adjust/ADJEvent.m

@@ -105,17 +105,15 @@ - (NSDictionary *) partnerParameters {
     return (NSDictionary *) self.partnerMutableParameters;
 }
 
-- (BOOL) checkEventToken:(NSString *)eventToken {
+- (BOOL)checkEventToken:(NSString *)eventToken {
     if ([ADJUtil isNull:eventToken]) {
         [self.logger error:@"Missing Event Token"];
         return NO;
     }
-
-    if (eventToken.length != 6) {
-        [self.logger error:@"Malformed Event Token '%@'", eventToken];
+    if ([eventToken length] <= 0) {
+        [self.logger error:@"Event Token can't be empty"];
         return NO;
     }
-
     return YES;
 }
 

ios/Adjust/ADJPackageBuilder.h

@@ -41,6 +41,8 @@
 
 - (ADJActivityPackage *)buildInfoPackage:(NSString *)infoSource;
 
+- (ADJActivityPackage *)buildAdRevenuePackage:(NSString *)source payload:(NSData *)payload;
+
 - (ADJActivityPackage *)buildClickPackage:(NSString *)clickSource;
 
 - (ADJActivityPackage *)buildAttributionPackage:(NSString *)initiatedBy;