Merge pull request #574 from adjust/v4335

shashanksu · web-flow · commit 8c377a81ea84 · 2023-07-05T10:48:53.000+02:00
Version 4.33.5
diff --git a/Adjust/build.gradle b/Adjust/build.gradle
@@ -9,7 +9,7 @@ ext {
     coreMinSdkVersion = 9
     coreCompileSdkVersion = 33
     coreTargetSdkVersion = 33
-    coreVersionName = '4.33.4'
+    coreVersionName = '4.33.5'
     defaultVersionCode = 1
     webbridgeMinSdkVersion = 17
     samsungReferrerMinSdkVersion = 18
diff --git a/Adjust/example-app-fbpixel/build.gradle b/Adjust/example-app-fbpixel/build.gradle
@@ -30,6 +30,7 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.1.1"
     implementation 'com.google.android.gms:play-services-ads-identifier:17.1.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
+    implementation 'com.google.android.gms:play-services-appset:16.0.2'
 
     implementation project(':sdk-core')
     implementation project(':sdk-plugin-webbridge')
diff --git a/Adjust/example-app-java/build.gradle b/Adjust/example-app-java/build.gradle
@@ -34,6 +34,7 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.1.1"
     implementation 'com.google.android.gms:play-services-ads-identifier:17.1.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
+    implementation 'com.google.android.gms:play-services-appset:16.0.2'
 
     implementation project(':sdk-core')
 }
diff --git a/Adjust/example-app-keyboard/build.gradle b/Adjust/example-app-keyboard/build.gradle
@@ -34,6 +34,7 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.1.1"
     implementation 'com.google.android.gms:play-services-ads-identifier:17.1.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
+    implementation 'com.google.android.gms:play-services-appset:16.0.2'
 
     implementation project(':sdk-core')
 }
diff --git a/Adjust/example-app-kotlin/build.gradle b/Adjust/example-app-kotlin/build.gradle
@@ -34,6 +34,7 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.1.1"
     implementation 'com.google.android.gms:play-services-ads-identifier:17.1.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
+    implementation 'com.google.android.gms:play-services-appset:16.0.2'
 
     implementation project(':sdk-core')
 }
diff --git a/Adjust/example-app-tv/build.gradle b/Adjust/example-app-tv/build.gradle
@@ -34,6 +34,7 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.1.1"
     implementation 'com.google.android.gms:play-services-ads-identifier:17.1.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
+    implementation 'com.google.android.gms:play-services-appset:16.0.2'
 
     implementation project(':sdk-core')
 }
diff --git a/Adjust/example-app-webbridge/build.gradle b/Adjust/example-app-webbridge/build.gradle
@@ -28,6 +28,7 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.1.1"
     implementation 'com.google.android.gms:play-services-ads-identifier:17.1.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
+    implementation 'com.google.android.gms:play-services-appset:16.0.2'
 
     implementation project(':sdk-core')
     implementation project(':sdk-plugin-webbridge')
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java
@@ -783,7 +783,7 @@ public void run(ActivityHandler activityHandler) {
 
         readConfigFile(adjustConfig.context);
 
-        deviceInfo = new DeviceInfo(adjustConfig.context, adjustConfig.sdkPrefix);
+        deviceInfo = new DeviceInfo(adjustConfig);
 
         if (adjustConfig.eventBufferingEnabled) {
             logger.info("Event buffering is enabled");
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java
@@ -34,7 +34,7 @@ private Adjust() {
      */
     public static synchronized AdjustInstance getDefaultInstance() {
         @SuppressWarnings("unused")
-        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.33.4";
+        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.33.5";
 
         if (defaultInstance == null) {
             defaultInstance = new AdjustInstance();
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java
@@ -29,7 +29,7 @@ public interface Constants {
 
     String SCHEME = "https";
     String AUTHORITY = "app.adjust.com";
-    String CLIENT_SDK = "android4.33.4";
+    String CLIENT_SDK = "android4.33.5";
     String LOGTAG = "Adjust";
     String REFTAG = "reftag";
     String INSTALL_REFERRER = "install_referrer";
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/DeviceInfo.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/DeviceInfo.java
@@ -80,8 +80,10 @@ class DeviceInfo {
     String appInstallTime;
     String appUpdateTime;
     int uiMode;
+    String appSetId;
 
-    DeviceInfo(Context context, String sdkPrefix) {
+    DeviceInfo(AdjustConfig adjustConfig) {
+        Context context = adjustConfig.context;
         Resources resources = context.getResources();
         DisplayMetrics displayMetrics = resources.getDisplayMetrics();
         Configuration configuration = resources.getConfiguration();
@@ -103,14 +105,17 @@ class DeviceInfo {
         screenDensity = getScreenDensity(displayMetrics);
         displayWidth = getDisplayWidth(displayMetrics);
         displayHeight = getDisplayHeight(displayMetrics);
-        clientSdk = getClientSdk(sdkPrefix);
+        clientSdk = getClientSdk(adjustConfig.sdkPrefix);
         fbAttributionId = getFacebookAttributionId(context);
         hardwareName = getHardwareName();
         abi = getABI();
         buildName = getBuildName();
         appInstallTime = getAppInstallTime(context);
         appUpdateTime = getAppUpdateTime(context);
         uiMode = getDeviceUiMode(configuration);
+        if (Util.canReadPlayIds(adjustConfig)) {
+            appSetId = Reflection.getAppSetId(context);
+        }
     }
 
     void reloadPlayIds(final AdjustConfig adjustConfig) {
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/PackageBuilder.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/PackageBuilder.java
@@ -286,6 +286,7 @@ private Map<String, String> getSessionParameters(boolean isInDelay) {
         PackageBuilder.addBoolean(parameters, "tracking_enabled", deviceInfo.isTrackingEnabled);
         PackageBuilder.addString(parameters, "fire_adid", Util.getFireAdvertisingId(adjustConfig));
         PackageBuilder.addBoolean(parameters, "fire_tracking_enabled", Util.getFireTrackingEnabled(adjustConfig));
+        PackageBuilder.addString(parameters, "google_app_set_id", deviceInfo.appSetId);
 
         if (!containsPlayIds(parameters) && !containsFireIds(parameters)) {
             logger.warn("Google Advertising ID or Fire Advertising ID not detected, " +
@@ -375,6 +376,7 @@ public Map<String, String> getEventParameters(AdjustEvent event, boolean isInDel
         PackageBuilder.addBoolean(parameters, "tracking_enabled", deviceInfo.isTrackingEnabled);
         PackageBuilder.addString(parameters, "fire_adid", Util.getFireAdvertisingId(adjustConfig));
         PackageBuilder.addBoolean(parameters, "fire_tracking_enabled", Util.getFireTrackingEnabled(adjustConfig));
+        PackageBuilder.addString(parameters, "google_app_set_id", deviceInfo.appSetId);
 
         if (!containsPlayIds(parameters) && !containsFireIds(parameters)) {
             logger.warn("Google Advertising ID or Fire Advertising ID not detected, " +
@@ -460,6 +462,7 @@ private Map<String, String> getInfoParameters(String source) {
         PackageBuilder.addBoolean(parameters, "tracking_enabled", deviceInfo.isTrackingEnabled);
         PackageBuilder.addString(parameters, "fire_adid", Util.getFireAdvertisingId(adjustConfig));
         PackageBuilder.addBoolean(parameters, "fire_tracking_enabled", Util.getFireTrackingEnabled(adjustConfig));
+        PackageBuilder.addString(parameters, "google_app_set_id", deviceInfo.appSetId);
 
         if (!containsPlayIds(parameters) && !containsFireIds(parameters)) {
             logger.warn("Google Advertising ID or Fire Advertising ID not detected, " +
@@ -513,6 +516,7 @@ private Map<String, String> getClickParameters(String source) {
         PackageBuilder.addBoolean(parameters, "tracking_enabled", deviceInfo.isTrackingEnabled);
         PackageBuilder.addString(parameters, "fire_adid", Util.getFireAdvertisingId(adjustConfig));
         PackageBuilder.addBoolean(parameters, "fire_tracking_enabled", Util.getFireTrackingEnabled(adjustConfig));
+        PackageBuilder.addString(parameters, "google_app_set_id", deviceInfo.appSetId);
 
         if (!containsPlayIds(parameters) && !containsFireIds(parameters)) {
             logger.warn("Google Advertising ID or Fire Advertising ID not detected, " +
@@ -621,6 +625,7 @@ private Map<String, String> getAttributionParameters(String initiatedBy) {
         PackageBuilder.addBoolean(parameters, "tracking_enabled", deviceInfo.isTrackingEnabled);
         PackageBuilder.addString(parameters, "fire_adid", Util.getFireAdvertisingId(adjustConfig));
         PackageBuilder.addBoolean(parameters, "fire_tracking_enabled", Util.getFireTrackingEnabled(adjustConfig));
+        PackageBuilder.addString(parameters, "google_app_set_id", deviceInfo.appSetId);
 
         if (!containsPlayIds(parameters) && !containsFireIds(parameters)) {
             logger.warn("Google Advertising ID or Fire Advertising ID not detected, " +
@@ -682,6 +687,7 @@ private Map<String, String> getGdprParameters() {
         PackageBuilder.addBoolean(parameters, "tracking_enabled", deviceInfo.isTrackingEnabled);
         PackageBuilder.addString(parameters, "fire_adid", Util.getFireAdvertisingId(adjustConfig));
         PackageBuilder.addBoolean(parameters, "fire_tracking_enabled", Util.getFireTrackingEnabled(adjustConfig));
+        PackageBuilder.addString(parameters, "google_app_set_id", deviceInfo.appSetId);
 
         if (!containsPlayIds(parameters) && !containsFireIds(parameters)) {
             logger.warn("Google Advertising ID or Fire Advertising ID not detected, " +
@@ -742,6 +748,7 @@ private Map<String, String> getDisableThirdPartySharingParameters() {
         PackageBuilder.addBoolean(parameters, "tracking_enabled", deviceInfo.isTrackingEnabled);
         PackageBuilder.addString(parameters, "fire_adid", Util.getFireAdvertisingId(adjustConfig));
         PackageBuilder.addBoolean(parameters, "fire_tracking_enabled", Util.getFireTrackingEnabled(adjustConfig));
+        PackageBuilder.addString(parameters, "google_app_set_id", deviceInfo.appSetId);
 
         if (!containsPlayIds(parameters) && !containsFireIds(parameters)) {
             logger.warn("Google Advertising ID or Fire Advertising ID not detected, " +
@@ -816,6 +823,7 @@ private Map<String, String> getDisableThirdPartySharingParameters() {
         PackageBuilder.addBoolean(parameters, "tracking_enabled", deviceInfo.isTrackingEnabled);
         PackageBuilder.addString(parameters, "fire_adid", Util.getFireAdvertisingId(adjustConfig));
         PackageBuilder.addBoolean(parameters, "fire_tracking_enabled", Util.getFireTrackingEnabled(adjustConfig));
+        PackageBuilder.addString(parameters, "google_app_set_id", deviceInfo.appSetId);
 
         if (!containsPlayIds(parameters) && !containsFireIds(parameters)) {
             logger.warn("Google Advertising ID or Fire Advertising ID not detected, " +
@@ -881,6 +889,7 @@ private Map<String, String> getMeasurementConsentParameters(
         PackageBuilder.addBoolean(parameters, "tracking_enabled", deviceInfo.isTrackingEnabled);
         PackageBuilder.addString(parameters, "fire_adid", Util.getFireAdvertisingId(adjustConfig));
         PackageBuilder.addBoolean(parameters, "fire_tracking_enabled", Util.getFireTrackingEnabled(adjustConfig));
+        PackageBuilder.addString(parameters, "google_app_set_id", deviceInfo.appSetId);
 
         if (!containsPlayIds(parameters) && !containsFireIds(parameters)) {
             logger.warn("Google Advertising ID or Fire Advertising ID not detected, " +
@@ -940,6 +949,7 @@ private Map<String, String> getAdRevenueParameters(String source, JSONObject adR
         PackageBuilder.addBoolean(parameters, "tracking_enabled", deviceInfo.isTrackingEnabled);
         PackageBuilder.addString(parameters, "fire_adid", Util.getFireAdvertisingId(adjustConfig));
         PackageBuilder.addBoolean(parameters, "fire_tracking_enabled", Util.getFireTrackingEnabled(adjustConfig));
+        PackageBuilder.addString(parameters, "google_app_set_id", deviceInfo.appSetId);
 
         if (!containsPlayIds(parameters) && !containsFireIds(parameters)) {
             logger.warn("Google Advertising ID or Fire Advertising ID not detected, " +
@@ -1031,6 +1041,7 @@ private Map<String, String> getAdRevenueParameters(AdjustAdRevenue adjustAdReven
         PackageBuilder.addBoolean(parameters, "tracking_enabled", deviceInfo.isTrackingEnabled);
         PackageBuilder.addString(parameters, "fire_adid", Util.getFireAdvertisingId(adjustConfig));
         PackageBuilder.addBoolean(parameters, "fire_tracking_enabled", Util.getFireTrackingEnabled(adjustConfig));
+        PackageBuilder.addString(parameters, "google_app_set_id", deviceInfo.appSetId);
 
         if (!containsPlayIds(parameters) && !containsFireIds(parameters)) {
             logger.warn("Google Advertising ID or Fire Advertising ID not detected, " +
@@ -1121,6 +1132,7 @@ private Map<String, String> getSubscriptionParameters(AdjustPlayStoreSubscriptio
         PackageBuilder.addBoolean(parameters, "tracking_enabled", deviceInfo.isTrackingEnabled);
         PackageBuilder.addString(parameters, "fire_adid", Util.getFireAdvertisingId(adjustConfig));
         PackageBuilder.addBoolean(parameters, "fire_tracking_enabled", Util.getFireTrackingEnabled(adjustConfig));
+        PackageBuilder.addString(parameters, "google_app_set_id", deviceInfo.appSetId);
 
         if (!containsPlayIds(parameters) && !containsFireIds(parameters)) {
             logger.warn("Google Advertising ID or Fire Advertising ID not detected, " +
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Reflection.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Reflection.java
@@ -4,6 +4,7 @@
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Map;
 
@@ -96,6 +97,30 @@ public static ReferrerDetails getVivoReferrer(Context context, ILogger logger) {
         return referrerDetails;
     }
 
+    public static String getAppSetId(Context context) {
+        try {
+            Object appSetIdClientObject =
+              invokeStaticMethod("com.google.android.gms.appset.AppSet",
+                "getClient",
+                new Class[]{Context.class}, context);
+
+            Object taskWithAppSetInfoObject =
+              invokeInstanceMethod(appSetIdClientObject,
+                "getAppSetIdInfo", null);
+
+            Object appSetInfoObject =
+              invokeStaticMethod("com.google.android.gms.tasks.Tasks",
+                "await",
+                new Class[]{forName("com.google.android.gms.tasks.Task")},
+                taskWithAppSetInfoObject);
+
+            return (String) invokeInstanceMethod(appSetInfoObject,
+              "getId", null);
+        } catch (Throwable t) {
+            return null;
+        }
+    }
+
     public static Class forName(String className) {
         try {
             Class classObject = Class.forName(className);
diff --git a/Adjust/sdk-plugin-criteo/build.gradle b/Adjust/sdk-plugin-criteo/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.33.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.33.5'
 }
 
 // read local properties
diff --git a/Adjust/sdk-plugin-imei/build.gradle b/Adjust/sdk-plugin-imei/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.33.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.33.5'
 }
 
 // read local properties
diff --git a/Adjust/sdk-plugin-oaid/build.gradle b/Adjust/sdk-plugin-oaid/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.33.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.33.5'
     implementation 'com.huawei.hms:ads-identifier:3.4.56.300'
 }
 
diff --git a/Adjust/sdk-plugin-samsung-referrer/build.gradle b/Adjust/sdk-plugin-samsung-referrer/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.33.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.33.5'
 
     // Add Samsung referrer lib via Maven.
     implementation 'store.galaxy.samsung.installreferrer:samsung_galaxystore_install_referrer:3.0.1'
diff --git a/Adjust/sdk-plugin-sociomantic/build.gradle b/Adjust/sdk-plugin-sociomantic/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.33.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.33.5'
 }
 
 // read local properties
diff --git a/Adjust/sdk-plugin-trademob/build.gradle b/Adjust/sdk-plugin-trademob/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.33.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.33.5'
 }
 
 // read local properties
diff --git a/Adjust/sdk-plugin-vivo-referrer/build.gradle b/Adjust/sdk-plugin-vivo-referrer/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.33.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.33.5'
 }
 
 // read local properties
diff --git a/Adjust/sdk-plugin-webbridge/build.gradle b/Adjust/sdk-plugin-webbridge/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.33.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.33.5'
 }
 
 // read local properties
diff --git a/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js b/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js
@@ -211,7 +211,7 @@ var Adjust = {
         if (this.adjustConfig) {
             return this.adjustConfig.getSdkPrefix();
         } else {
-            return 'web-bridge4.33.4';
+            return 'web-bridge4.33.5';
         }
     },
 
diff --git a/Adjust/sdk-plugin-xiaomi-referrer/build.gradle b/Adjust/sdk-plugin-xiaomi-referrer/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.33.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.33.5'
 
     // Add xiaomi referrer lib via Maven.
     implementation 'com.miui.referrer:homereferrer:1.0.0.6'
diff --git a/Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java b/Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java
@@ -53,7 +53,7 @@ public TestActivityPackage(ActivityPackage activityPackage) {
         // default values
         appToken = "123456789012";
         environment = "sandbox";
-        clientSdk = "android4.33.4";
+        clientSdk = "android4.33.5";
         suffix = "";
         attribution = new AdjustAttribution();
         playServices = true;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### Version 4.33.5 (5th July 2023)
+#### Added
+- Added sending of App Set Identifier.
+
+---
+
 ### Version 4.33.4 (27th April 2023)
 #### Changed
 - Updated Samsung Install Referrer library version to 3.0.1.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.33.4
+4.33.5

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ dependencies {`
`34`	`34`	`implementation "androidx.constraintlayout:constraintlayout:2.1.1"`
`35`	`35`	`implementation 'com.google.android.gms:play-services-ads-identifier:17.1.0'`
`36`	`36`	`implementation 'com.android.installreferrer:installreferrer:2.2'`
	`37`	`+ implementation 'com.google.android.gms:play-services-appset:16.0.2'`
`37`	`38`
`38`	`39`	`implementation project(':sdk-core')`
`39`	`40`	`}`