Merge pull request #217 from adjust/v4350

Version 4.35.0

Author: uerceg

CHANGELOG.md

@@ -1,3 +1,17 @@
+### Version 4.35.0 (6th October 2023)
+#### Added
+- Added ability to read App Set ID on Android platform in case you opt in by adding the `com.google.android.gms:play-services-appset` dependency to your Android app.
+- Added ability to delay SDK start on iOS platform in order to wait for an answer to the ATT dialog. You can set the number of seconds to wait (capped internally to 120) by calling the `setAttConsentWaitingInterval` method of the `AdjustConfig` instance.
+- Added support for purchase verification. In case you are using this feature, you can now use it by calling `verifyAppStorePurchase` (for iOS) and `verifyPlayStorePurchase` (for Android) methods of the `Adjust` instance.
+- Added support for SigV3 library. Update authorization header building logic to use `adj_signing_id`.
+- Added `setAndroidFinalAttributionEnabled` method to `AdjustConfig` to indicate if only final Android attribution is needed in attribution callback (by default attribution callback return intermediate attribution as well before final attribution if not enabled with this setter method).
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.35.1]
+- [[email protected]][android_sdk_v4.35.0]
+
+---
+
 ### Version 4.33.0 (15th January 2023)
 #### Added
 - Added support for SKAdNetwork 4.0.
@@ -564,6 +578,7 @@
 [ios_sdk_v4.31.0]: https://github.com/adjust/ios_sdk/tree/v4.31.0
 [ios_sdk_v4.32.1]: https://github.com/adjust/ios_sdk/tree/v4.32.1
 [ios_sdk_v4.33.3]: https://github.com/adjust/ios_sdk/tree/v4.33.3
+[ios_sdk_v4.35.1]: https://github.com/adjust/ios_sdk/tree/v4.35.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
@@ -596,3 +611,4 @@
 [android_sdk_v4.31.0]: https://github.com/adjust/android_sdk/tree/v4.31.0
 [android_sdk_v4.32.0]: https://github.com/adjust/android_sdk/tree/v4.32.0
 [android_sdk_v4.33.2]: https://github.com/adjust/android_sdk/tree/v4.33.2
+[android_sdk_v4.35.0]: https://github.com/adjust/android_sdk/tree/v4.35.0

README.md

@@ -153,18 +153,24 @@ The Adjust SDK by default adds two permissions to your app's `AndroidManifest.xm
 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 ```
 
-The `INTERNET` permission might be needed by our SDK at any point in time. The `ACCESS_WIFI_STATE` permission is needed by the Adjust SDK if your app is not targeting the Google Play Store and doesn't use Google Play Services. If you are targeting the Google Play Store and you are using Google Play Services, the Adjust SDK doesn't need this permission and, if you don't need it anywhere else in your app, you can remove it.
+The `INTERNET` permission might be needed by our SDK at any point in time. The `ACCESS_NETWORK_STATE` permission is needed for reading type of network device is connected to.
 
 #### <a id="gps-adid-permission"></a>Add permission to gather Google advertising ID
 
-If you are targeting Android 12 and above (API level 31), you need to add the `com.google.android.gms.AD_ID` permission to read the device's advertising ID. Add the following line to your `AndroidManifest.xml` to enable the permission.
+If you are targeting Android 12 and above (API level 31), you need to add the `com.google.android.gms.AD_ID` permission to read the device's advertising ID. This will be done automatically by the Adjust SDK for you:
 
 ```xml
 <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 ```
 
 For more information, see [Google's `AdvertisingIdClient.Info` documentation](https://developers.google.com/android/reference/com/google/android/gms/ads/identifier/AdvertisingIdClient.Info#public-string-getid).
 
+In case you don't want this permission to be part of your app, you can remove it by adding following line to your `AndroidManifest.xml` file:
+
+```xml
+<uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
+```
+
 ### <a id="android-gps"></a>Google Play Services
 
 Since August 1, 2014, apps in the Google Play Store must use the [Google Advertising ID][google-ad-id] to uniquely identify devices. To allow the Adjust SDK to use the Google Advertising ID, you must integrate [Google Play Services][google-play-services]. 

VERSION

@@ -1 +1 @@
-4.33.0
+4.35.0

android/build.gradle

@@ -2,10 +2,10 @@ apply plugin: 'com.android.library'
 
 def _ext = rootProject.ext
 
-def _compileSdkVersion = _ext.has('compileSdkVersion') ? _ext.compileSdkVersion : 26
-def _buildToolsVersion = _ext.has('buildToolsVersion') ? _ext.buildToolsVersion : "26.0.3"
+def _compileSdkVersion = _ext.has('compileSdkVersion') ? _ext.compileSdkVersion : 33
+def _buildToolsVersion = _ext.has('buildToolsVersion') ? _ext.buildToolsVersion : "33.0.0"
 def _minSdkVersion = _ext.has('minSdkVersion') ? _ext.minSdkVersion : 16
-def _targetSdkVersion = _ext.has('targetSdkVersion') ? _ext.targetSdkVersion : 26
+def _targetSdkVersion = _ext.has('targetSdkVersion') ? _ext.targetSdkVersion : 33
 
 android {
     compileSdkVersion _compileSdkVersion

android/libs/adjust-android.jar

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.adjust.nativemodule">
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 
     <application>
         <receiver 

android/src/main/AndroidManifest.xml

@@ -127,6 +127,7 @@ public void create(ReadableMap mapConfig) {
         boolean needsCost = false;
         boolean playStoreKidsAppEnabled = false;
         boolean coppaCompliantEnabled = false;
+        boolean finalAndroidAttributionEnabled = false;
 
         // Suppress log level.
         if (checkKey(mapConfig, "logLevel")) {
@@ -304,6 +305,12 @@ && checkKey(mapConfig, "info4")) {
             adjustConfig.setCoppaCompliantEnabled(coppaCompliantEnabled);
         }
 
+        // Final Android attribution.
+        if (checkKey(mapConfig, "finalAndroidAttributionEnabled")) {
+            finalAndroidAttributionEnabled = mapConfig.getBoolean("finalAndroidAttributionEnabled");
+            adjustConfig.setFinalAttributionEnabled(finalAndroidAttributionEnabled);
+        }
+
         // Attribution callback.
         if (attributionCallback) {
             adjustConfig.setOnAttributionChangedListener(this);
@@ -349,6 +356,8 @@ public void trackEvent(ReadableMap mapEvent) {
         String eventToken = null;
         String currency = null;
         String transactionId = null;
+        String productId = null;
+        String purchaseToken = null;
         String callbackId = null;
         Map<String, Object> callbackParameters = null;
         Map<String, Object> partnerParameters = null;
@@ -408,6 +417,22 @@ public void trackEvent(ReadableMap mapEvent) {
             }
         }
 
+        // Product ID.
+        if (checkKey(mapEvent, "productId")) {
+            productId = mapEvent.getString("productId");
+            if (null != productId) {
+                event.setProductId(productId);
+            }
+        }
+
+        // Purchase token.
+        if (checkKey(mapEvent, "purchaseToken")) {
+            purchaseToken = mapEvent.getString("purchaseToken");
+            if (null != purchaseToken) {
+                event.setPurchaseToken(purchaseToken);
+            }
+        }
+
         // Track event.
         com.adjust.sdk.Adjust.trackEvent(event);
     }
@@ -786,6 +811,47 @@ public void trackMeasurementConsent(boolean measurementConsent) {
         com.adjust.sdk.Adjust.trackMeasurementConsent(measurementConsent);
     }
 
+    @ReactMethod
+    public void verifyPlayStorePurchase(ReadableMap mapEvent, Callback callback) {
+        if (mapEvent == null) {
+            return;
+        }
+
+        String productId = null;
+        String purchaseToken = null;
+
+        // Product ID.
+        if (checkKey(mapEvent, "productId")) {
+            productId = mapEvent.getString("productId");
+        }
+
+        // Purchase token.
+        if (checkKey(mapEvent, "purchaseToken")) {
+            purchaseToken = mapEvent.getString("purchaseToken");
+        }
+
+        // Create purchase instance.
+        final AdjustPurchase purchase = new AdjustPurchase(productId, purchaseToken);
+
+        // Verify purchase.
+        com.adjust.sdk.Adjust.verifyPurchase(purchase, new OnPurchaseVerificationFinishedListener() {
+            @Override
+            public void onVerificationFinished(AdjustPurchaseVerificationResult verificationResult) {
+                if (callback != null) {
+                    WritableMap map = Arguments.createMap();
+                    if (null == verificationResult) {
+                        callback.invoke(map);
+                        return;
+                    }
+                    map.putString("verificationStatus", null != verificationResult.getVerificationStatus() ? verificationResult.getVerificationStatus() : "");
+                    map.putString("code", String.valueOf(verificationResult.getCode()));
+                    map.putString("message", null != verificationResult.getMessage() ? verificationResult.getMessage() : "");
+                    callback.invoke(map);
+                }
+            }
+        });
+    }
+
     @ReactMethod
     public void checkForNewAttStatus() {
         // do nothing
@@ -861,6 +927,10 @@ public void setTestOptions(ReadableMap mapTest) {
             String value = mapTest.getString("subscriptionUrl");
             testOptions.subscriptionUrl = value;
         }
+        if (checkKey(mapTest, "purchaseVerificationUrl")) {
+            String value = mapTest.getString("purchaseVerificationUrl");
+            testOptions.purchaseVerificationUrl = value;
+        }
         if (checkKey(mapTest, "basePath")) {
             String value = mapTest.getString("basePath");
             testOptions.basePath = value;
@@ -873,6 +943,10 @@ public void setTestOptions(ReadableMap mapTest) {
             String value = mapTest.getString("subscriptionPath");
             testOptions.subscriptionPath = value;
         }
+        if (checkKey(mapTest, "purchaseVerificationPath")) {
+            String value = mapTest.getString("purchaseVerificationPath");
+            testOptions.purchaseVerificationPath = value;
+        }
         // if (checkKey(mapTest, "useTestConnectionOptions")) {
         //     boolean value = mapTest.getBoolean("useTestConnectionOptions");
         //     testOptions.useTestConnectionOptions = value;

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

@@ -58,6 +58,10 @@ final class AdjustUtil {
     private static final String SESSION_FAILED_WILL_RETRY = "willRetry";
     private static final String SESSION_FAILED_JSON_RESPONSE = "jsonResponse";
 
+    private static final String PURCHAE_VERIFICATION_STATUS = "verificationStatus";
+    private static final String PURCHAE_VERIFICATION_CODE = "code";
+    private static final String PURCHAE_VERIFICATION_MESSAGE = "message";
+
     public static WritableMap attributionToMap(AdjustAttribution attribution) {
         WritableMap map = Arguments.createMap();
         if (null == attribution) {

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

@@ -43,7 +43,9 @@ const App: () => React$Node = () => {
   // adjustConfig.setUserAgent("Custom Adjust User Agent");
   // adjustConfig.setUrlStrategy(AdjustConfig.UrlStrategyChina);
   // adjustConfig.deactivateSKAdNetworkHandling();
-  adjustConfig.setNeedsCost(true);
+  // adjustConfig.setNeedsCost(true);
+  // adjustConfig.setAttConsentWaitingInterval(16);
+  // adjustConfig.setFinalAndroidAttributionEnabled(true);
 
   adjustConfig.setAttributionCallbackListener(function(attribution) {
     console.log("Attribution callback received");

example/App.js

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSUserTrackingUsageDescription</key>
+	<string>For testing purposes to be able to show ATT dialog.</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>