Merge pull request #262 from adjust/v510

uerceg · web-flow · commit 705eb4b4d4e0 · 2025-02-25T15:26:10.000+01:00
Version 5.1.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+### Version 5.1.0 (25th February 2025)
+#### Added
+- Added `jsonResponse` field (JSON string) to `AdjustAttribution` where every key-value pair sent by the backend as part of the attribution response can be found.
+
+#### Fixed
+- Fixed occasional occurrences in which ATT waiting interval timer was not being started.
+- Fixed occasional NPE occurrences when app was entering background (https://github.com/adjust/android_sdk/issues/630).
+
+#### Native SDKs
+- [iOS@v5.1.1][ios_sdk_v5.1.1]
+- [Android@v5.1.0][android_sdk_v5.1.0]
+
+---
+
 ### Version 5.0.4 (17th January 2025)
 #### Fixed
 - Fixed type mismatch of some `AdjustPlayStoreSubscription` fields in JS and TS (https://github.com/adjust/react_native_sdk/issues/260).
@@ -720,6 +734,7 @@ In case you were using beta version of the SDK v5, please switch to the official
 [ios_sdk_v5.0.0]: https://github.com/adjust/ios_sdk/tree/v5.0.0
 [ios_sdk_v5.0.1]: https://github.com/adjust/ios_sdk/tree/v5.0.1
 [ios_sdk_v5.0.2]: https://github.com/adjust/ios_sdk/tree/v5.0.2
+[ios_sdk_v5.1.1]: https://github.com/adjust/ios_sdk/tree/v5.1.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
@@ -760,3 +775,4 @@ In case you were using beta version of the SDK v5, please switch to the official
 [android_sdk_v5.0.0]: https://github.com/adjust/android_sdk/tree/v5.0.0
 [android_sdk_v5.0.1]: https://github.com/adjust/android_sdk/tree/v5.0.1
 [android_sdk_v5.0.2]: https://github.com/adjust/android_sdk/tree/v5.0.2
+[android_sdk_v5.1.0]: https://github.com/adjust/android_sdk/tree/v5.1.0
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.0.4
+5.1.0
diff --git a/android/build.gradle b/android/build.gradle
@@ -27,5 +27,5 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.adjust.sdk:adjust-android:5.0.2'
+    implementation 'com.adjust.sdk:adjust-android:5.1.0'
 }
diff --git a/android/src/main/java/com/adjust/sdk/AdjustUtil.java b/android/src/main/java/com/adjust/sdk/AdjustUtil.java
@@ -29,6 +29,7 @@ final class AdjustUtil {
     private static final String ATTRIBUTION_COST_TYPE = "costType";
     private static final String ATTRIBUTION_COST_AMOUNT = "costAmount";
     private static final String ATTRIBUTION_COST_CURRENCY = "costCurrency";
+    private static final String ATTRIBUTION_JSON_RESPONSE = "jsonResponse";
     private static final String ATTRIBUTION_FB_INSTALL_REFERRER = "fbInstallReferrer";
 
     private static final String EVENT_SUCCESS_MESSAGE = "message";
@@ -77,6 +78,7 @@ public static WritableMap attributionToMap(AdjustAttribution attribution) {
         map.putString(ATTRIBUTION_COST_TYPE, null != attribution.costType ? attribution.costType : "");
         map.putDouble(ATTRIBUTION_COST_AMOUNT, null != attribution.costAmount && !attribution.costAmount.isNaN() ? attribution.costAmount : 0);
         map.putString(ATTRIBUTION_COST_CURRENCY, null != attribution.costCurrency ? attribution.costCurrency : "");
+        map.putString(ATTRIBUTION_JSON_RESPONSE, null != attribution.jsonResponse ? attribution.jsonResponse.toString() : "");
         map.putString(ATTRIBUTION_FB_INSTALL_REFERRER, null != attribution.fbInstallReferrer ? attribution.fbInstallReferrer : "");
         return map;
     }
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1,7 +1,7 @@
 PODS:
-  - Adjust (5.0.2):
-    - Adjust/Adjust (= 5.0.2)
-  - Adjust/Adjust (5.0.2):
+  - Adjust (5.1.0):
+    - Adjust/Adjust (= 5.1.0)
+  - Adjust/Adjust (5.1.0):
     - AdjustSignature (= 3.35.2)
   - AdjustSignature (3.35.2)
   - boost (1.83.0)
@@ -940,8 +940,8 @@ PODS:
   - React-Mapbuffer (0.74.2):
     - glog
     - React-debug
-  - react-native-adjust (5.0.4):
-    - Adjust (= 5.0.2)
+  - react-native-adjust (5.0.5):
+    - Adjust (= 5.1.0)
     - React-Core
   - React-nativeconfig (0.74.2)
   - React-NativeModulesApple (0.74.2):
@@ -1354,7 +1354,7 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  Adjust: 9ac6dd4a33cb343874633dc14e94c01a6c0f1cdf
+  Adjust: 3ba600784c200eb13664e92f8385230750682d4f
   AdjustSignature: 23b9e5d4adcadffc303bb6b410fde617dd88504f
   boost: d3f49c53809116a5d38da093a8aa78bf551aed09
   DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
@@ -1386,7 +1386,7 @@ SPEC CHECKSUMS:
   React-jsitracing: 0fa7f78d8fdda794667cb2e6f19c874c1cf31d7e
   React-logger: 29fa3e048f5f67fe396bc08af7606426d9bd7b5d
   React-Mapbuffer: bf56147c9775491e53122a94c423ac201417e326
-  react-native-adjust: e26ec2e5222bdec9d5f6ca6ed975215248d6a9c5
+  react-native-adjust: 9a00021c6e86d4b72a38ef46c77b16e111d0166f
   React-nativeconfig: 9f223cd321823afdecf59ed00861ab2d69ee0fc1
   React-NativeModulesApple: ff7efaff7098639db5631236cfd91d60abff04c0
   React-perflogger: 32ed45d9cee02cf6639acae34251590dccd30994
diff --git a/example/package.json b/example/package.json
@@ -30,7 +30,7 @@
     "jest": "^29.6.3",
     "prettier": "2.8.8",
     "react-test-renderer": "18.2.0",
-    "typescript": "5.0.4"
+    "typescript": "5.0.5"
   },
   "engines": {
     "node": ">=18"
diff --git a/ext/android/sdk b/ext/android/sdk
@@ -1 +1 @@
-Subproject commit 942960d443f69eb6a61e07b1180c1edb5be6c2da
+Subproject commit e975ab6cd2d626ab2159757767680e8f400c2076
diff --git a/ext/ios/sdk b/ext/ios/sdk
@@ -1 +1 @@
-Subproject commit 5a48793570916c6379696a9c16edb6e93939ce9e
+Subproject commit a32b766c9d798dbdfd90cc692060359bf777c654
diff --git a/ext/scripts b/ext/scripts
@@ -1 +1 @@
-Subproject commit 3ac67155c215070a39a02b36a4c0e9cd8e7a91b9
+Subproject commit eb920de275dae8f5ff1aace0efe47600df54277e
diff --git a/index.d.ts b/index.d.ts
@@ -13,6 +13,7 @@ declare module 'react-native-adjust' {
     costType: string
     costAmount: number
     costCurrency: string
+    jsonResponse: string
     fbInstallReferrer: string
   }
 
diff --git a/index.js b/index.js
@@ -152,7 +152,7 @@ Adjust.getAmazonAdId = function(callback) {
 };
 
 Adjust.getSdkVersion = function(callback) {
-    module_adjust.getSdkVersion("react-native5.0.4", callback);
+    module_adjust.getSdkVersion("react-native5.1.0", callback);
 };
 
 Adjust.requestAppTrackingAuthorization = function(callback) {
@@ -294,7 +294,7 @@ Adjust.onPause = function(testParam) {
 // AdjustConfig
 
 var AdjustConfig = function(appToken, environment) {
-    this.sdkPrefix = "react-native5.0.4";
+    this.sdkPrefix = "react-native5.1.0";
     this.appToken = appToken;
     this.environment = environment;
     this.logLevel = null;
diff --git a/ios/AdjustSdk.m b/ios/AdjustSdk.m
@@ -287,15 +287,7 @@ @implementation AdjustSdk
         return;
     }
 
-    NSURL *url;
-    if ([NSString instancesRespondToSelector:@selector(stringByAddingPercentEncodingWithAllowedCharacters:)]) {
-        url = [NSURL URLWithString:[strUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]];
-    } else {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        url = [NSURL URLWithString:[strUrl stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
-    }
-#pragma clang diagnostic pop
+    NSURL *url = [NSURL URLWithString:strUrl];
     [Adjust processDeeplink:[[ADJDeeplink alloc] initWithDeeplink:url]];
 }
 
@@ -542,6 +534,14 @@ @implementation AdjustSdk
         [self addValueOrEmpty:dictionary key:@"costType" value:attribution.costType];
         [self addValueOrEmpty:dictionary key:@"costAmount" value:attribution.costAmount];
         [self addValueOrEmpty:dictionary key:@"costCurrency" value:attribution.costCurrency];
+        if (attribution.jsonResponse != nil) {
+            NSData *dataJsonResponse = [NSJSONSerialization dataWithJSONObject:attribution.jsonResponse
+                                                                       options:0 error:nil];
+            NSString *stringJsonResponse = [[NSString alloc] initWithBytes:[dataJsonResponse bytes]
+                                                                    length:[dataJsonResponse length]
+                                                                  encoding:NSUTF8StringEncoding];
+            [self addValueOrEmpty:dictionary key:@"jsonResponse" value:stringJsonResponse];
+        }
         callback(@[dictionary]);
     }];
 }
@@ -699,16 +699,7 @@ @implementation AdjustSdk
         return;
     }
 
-    NSURL *url;
-    if ([NSString instancesRespondToSelector:@selector(stringByAddingPercentEncodingWithAllowedCharacters:)]) {
-        url = [NSURL URLWithString:[strUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]];
-    } else {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        url = [NSURL URLWithString:[strUrl stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
-    }
-#pragma clang diagnostic pop
-
+    NSURL *url = [NSURL URLWithString:strUrl];
     // process deeplink
     [Adjust processAndResolveDeeplink:[[ADJDeeplink alloc] initWithDeeplink:url] withCompletionHandler:^(NSString * _Nonnull resolvedLink) {
         if (resolvedLink == nil) {
diff --git a/ios/AdjustSdkDelegate.m b/ios/AdjustSdkDelegate.m
@@ -101,6 +101,14 @@ - (void)adjustAttributionChangedWannabe:(ADJAttribution *)attribution {
     [self addValueOrEmpty:dictionary key:@"costType" value:attribution.costType];
     [self addValueOrEmpty:dictionary key:@"costAmount" value:attribution.costAmount];
     [self addValueOrEmpty:dictionary key:@"costCurrency" value:attribution.costCurrency];
+    if (attribution.jsonResponse != nil) {
+        NSData *dataJsonResponse = [NSJSONSerialization dataWithJSONObject:attribution.jsonResponse
+                                                                   options:0 error:nil];
+        NSString *stringJsonResponse = [[NSString alloc] initWithBytes:[dataJsonResponse bytes]
+                                                                length:[dataJsonResponse length]
+                                                              encoding:NSUTF8StringEncoding];
+        [self addValueOrEmpty:dictionary key:@"jsonResponse" value:stringJsonResponse];
+    }
     [AdjustEventEmitter dispatchEvent:@"adjust_attributionChanged" withDictionary:dictionary];
 }
 
@@ -198,6 +206,7 @@ - (void)adjustSkanUpdatedWithConversionDataWannabe:(nonnull NSDictionary<NSStrin
     [self addValueOrEmpty:dictionary key:@"conversionValue" value:data[@"conversion_value"]];
     [self addValueOrEmpty:dictionary key:@"coarseValue" value:data[@"coarse_value"]];
     [self addValueOrEmpty:dictionary key:@"lockWindow" value:data[@"lock_window"]];
+    [self addValueOrEmpty:dictionary key:@"lastSkanUpdate" value:data[@"last_skan_update"]];
     [self addValueOrEmpty:dictionary key:@"error" value:data[@"error"]];
     [AdjustEventEmitter dispatchEvent:@"adjust_skanUpdated" withDictionary:dictionary];
 }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "react-native-adjust",
     "description": "Adjust React Native SDK",
-    "version": "5.0.4",
+    "version": "5.1.0",
     "main": "index.js",
     "author": "Adjust",
     "license": "MIT",
diff --git a/plugins/oaid/package.json b/plugins/oaid/package.json
@@ -1,7 +1,7 @@
 {
     "name": "react-native-adjust-oaid",
     "description": "Adjust React Native OAID plugin",
-    "version": "5.0.4",
+    "version": "5.1.0",
     "main": "index.js",
     "author": "Adjust",
     "license": "MIT",
diff --git a/react-native-adjust.podspec b/react-native-adjust.podspec
@@ -18,6 +18,6 @@ Pod::Spec.new do |s|
   s.preserve_paths = 'LICENSE', 'README.md', 'package.json', 'index.js'
   s.source_files   = 'ios/*.{h,m}'
 
-  s.dependency 'Adjust', '5.0.2'
+  s.dependency 'Adjust', '5.1.1'
   s.dependency 'React-Core'
 end
diff --git a/test/app/App.js b/test/app/App.js
@@ -48,15 +48,15 @@ const App: () => React$Node = () => {
   }
 
   var urlOverwrite = "";
-  var ipAddress = "192.168.8.202";
+  var ipAddress = "192.168.8.207";
   if (Platform.OS === "android") {
     urlOverwrite = "https://" + ipAddress + ":8443";
   } else if (Platform.OS === "ios") {
     urlOverwrite = "http://" + ipAddress + ":8080";
   }
   var controlUrl = "ws://" + ipAddress + ":1987";
 
-  // AdjustSdkTest.addTestDirectory("tracking-domain");
+  // AdjustSdkTest.addTestDirectory("coppa");
   // AdjustSdkTest.addTest("Test_Skan_all_packages");
   Adjust.getSdkVersion(function (sdkVersion) {
     AdjustSdkTest.startTestSession(urlOverwrite, controlUrl, sdkVersion);
diff --git a/test/app/command_executor.js b/test/app/command_executor.js
@@ -364,6 +364,18 @@ AdjustCommandExecutor.prototype.config = function(params) {
             AdjustSdkTest.addInfoToSend('cost_amount', attribution.costAmount.toString());
             AdjustSdkTest.addInfoToSend('cost_currency', attribution.costCurrency);
             AdjustSdkTest.addInfoToSend('fb_install_referrer', attribution.fbInstallReferrer);
+           
+            const attributionJsonResponse = JSON.parse(attribution.jsonResponse);
+            if (attributionJsonResponse.cost_amount !== undefined) {
+                attributionJsonResponse.cost_amount = parseFloat(attributionJsonResponse.cost_amount.toFixed(2));
+            }
+            if (Platform.OS === 'ios') {
+                delete attributionJsonResponse.fb_install_referrer;
+            }
+
+            if (attribution.jsonResponse != null) {
+                AdjustSdkTest.addInfoToSend('json_response', JSON.stringify(attributionJsonResponse));
+            }
             AdjustSdkTest.sendInfoToServer(_this.extraPath);
         });
     }
@@ -446,6 +458,7 @@ AdjustCommandExecutor.prototype.config = function(params) {
             AdjustSdkTest.addInfoToSend('conversion_value', skanData.conversionValue);
             AdjustSdkTest.addInfoToSend('coarse_value', skanData.coarseValue);
             AdjustSdkTest.addInfoToSend('lock_window', skanData.lockWindow);
+            AdjustSdkTest.addInfoToSend('last_skan_update', skanData.lastSkanUpdate);
             AdjustSdkTest.sendInfoToServer(_this.extraPath);
         });
     }
@@ -978,6 +991,16 @@ AdjustCommandExecutor.prototype.attributionGetter = function(params) {
         AdjustSdkTest.addInfoToSend('cost_amount', attribution.costAmount.toString());
         AdjustSdkTest.addInfoToSend('cost_currency', attribution.costCurrency);
         AdjustSdkTest.addInfoToSend('fb_install_referrer', attribution.fbInstallReferrer);
+
+        const attributionJsonResponse = JSON.parse(attribution.jsonResponse);
+        if (attributionJsonResponse.cost_amount !== undefined) {
+            attributionJsonResponse.cost_amount = parseFloat(attributionJsonResponse.cost_amount.toFixed(2));
+        }
+        if (Platform.OS === 'ios') {
+            delete attributionJsonResponse.fb_install_referrer;
+        }
+        AdjustSdkTest.addInfoToSend('json_response', JSON.stringify(attributionJsonResponse)); 
+
         AdjustSdkTest.sendInfoToServer(_this.extraPath);
     });
 };
diff --git a/test/app/ios/Podfile.lock b/test/app/ios/Podfile.lock
diff --git a/test/lib/android/libs/adjust-test-library.jar b/test/lib/android/libs/adjust-test-library.jar
diff --git a/test/lib/android/libs/adjust-test-options.jar b/test/lib/android/libs/adjust-test-options.jar
diff --git a/test/lib/package.json b/test/lib/package.json

Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,5 @@ android {`
`27`	`27`
`28`	`28`	`dependencies {`
`29`	`29`	`implementation 'com.facebook.react:react-native:+'`
`30`		`- implementation 'com.adjust.sdk:adjust-android:5.0.2'`
	`30`	`+ implementation 'com.adjust.sdk:adjust-android:5.1.0'`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ declare module 'react-native-adjust' {`
`13`	`13`	`costType: string`
`14`	`14`	`costAmount: number`
`15`	`15`	`costCurrency: string`
	`16`	`+ jsonResponse: string`
`16`	`17`	`fbInstallReferrer: string`
`17`	`18`	`}`
`18`	`19`