Merge pull request #554 from adjust/v4320

Version 4.32.0
adjust · Sep 7, 2022 · 98a78dd · 98a78dd
2 parents 859af50 + 05b4af9
commit 98a78dd
Show file tree

Hide file tree

Showing 33 changed files with 153 additions and 65 deletions.
diff --git a/Adjust/build.gradle b/Adjust/build.gradle
@@ -7,9 +7,9 @@ subprojects {
 ext {
     // Android config.
     coreMinSdkVersion = 9
-    coreCompileSdkVersion = 32
-    coreTargetSdkVersion = 32
-    coreVersionName = '4.31.1'
+    coreCompileSdkVersion = 33
+    coreTargetSdkVersion = 33
+    coreVersionName = '4.32.0'
     defaultVersionCode = 1
     webbridgeMinSdkVersion = 17
 

diff --git a/Adjust/example-app-fbpixel/build.gradle b/Adjust/example-app-fbpixel/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.adjust.examples"
         minSdkVersion 17
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }

diff --git a/Adjust/example-app-java/build.gradle b/Adjust/example-app-java/build.gradle
@@ -7,12 +7,12 @@ repositories {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.adjust.examples"
         minSdkVersion 14
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }

diff --git a/Adjust/example-app-keyboard/build.gradle b/Adjust/example-app-keyboard/build.gradle
@@ -7,12 +7,12 @@ repositories {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.adjust.examples.keyboard"
         minSdkVersion 14
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }

diff --git a/Adjust/example-app-kotlin/build.gradle b/Adjust/example-app-kotlin/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
 
 
     defaultConfig {
         applicationId "com.adjust.examples"
         minSdkVersion 14
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
 

diff --git a/Adjust/example-app-tv/build.gradle b/Adjust/example-app-tv/build.gradle
@@ -7,12 +7,12 @@ repositories {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.adjust.examples"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }

diff --git a/Adjust/example-app-webbridge/build.gradle b/Adjust/example-app-webbridge/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.example.examples"
         minSdkVersion 17
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }

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
@@ -32,7 +32,7 @@ private Adjust() {
      */
     public static synchronized AdjustInstance getDefaultInstance() {
         @SuppressWarnings("unused")
-        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.31.1";
+        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.32.0";
 
         if (defaultInstance == null) {
             defaultInstance = new AdjustInstance();

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustThirdPartySharing.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustThirdPartySharing.java
@@ -6,10 +6,12 @@
 public class AdjustThirdPartySharing {
     Boolean isEnabled;
     Map<String, Map<String, String>> granularOptions;
+    Map<String, Map<String, Boolean>> partnerSharingSettings;
 
     public AdjustThirdPartySharing(final Boolean isEnabled) {
         this.isEnabled = isEnabled;
         granularOptions = new HashMap<>();
+        partnerSharingSettings = new HashMap<>();
     }
 
     public void addGranularOption(final String partnerName,
@@ -30,4 +32,23 @@ public void addGranularOption(final String partnerName,
 
         partnerOptions.put(key, value);
     }
+
+    public void addPartnerSharingSetting(final String partnerName,
+                                         final String key,
+                                         final boolean value)
+    {
+        if (partnerName == null || key == null) {
+            ILogger logger = AdjustFactory.getLogger();
+            logger.error("Cannot add partner sharing setting with any null value");
+            return;
+        }
+
+        Map<String, Boolean> partnerSharingSetting = this.partnerSharingSettings.get(partnerName);
+        if (partnerSharingSetting == null) {
+            partnerSharingSetting = new HashMap<>();
+            partnerSharingSettings.put(partnerName, partnerSharingSetting);
+        }
+
+        partnerSharingSetting.put(key, value);
+    }
 }
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.31.1";
+    String CLIENT_SDK = "android4.32.0";
     String LOGTAG = "Adjust";
     String REFTAG = "reftag";
     String INSTALL_REFERRER = "install_referrer";

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
@@ -804,6 +804,9 @@ private Map<String, String> getDisableThirdPartySharingParameters() {
         PackageBuilder.addMapJson(parameters, "granular_third_party_sharing_options",
                 adjustThirdPartySharing.granularOptions);
 
+        PackageBuilder.addMapJson(parameters, "partner_sharing_settings",
+                adjustThirdPartySharing.partnerSharingSettings);
+
         // Device identifiers.
         deviceInfo.reloadPlayIds(adjustConfig);
         PackageBuilder.addString(parameters, "android_uuid", activityStateCopy.uuid);

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/PreinstallUtil.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/PreinstallUtil.java
@@ -265,37 +265,48 @@ private static List<String> readContentProviderIntentAction(final Context contex
                                                                 final String permission,
                                                                 final ILogger logger)
     {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            List<ResolveInfo> providers = context.getPackageManager()
-                                                 .queryIntentContentProviders(
-                                                         new Intent(ADJUST_PREINSTALL_CONTENT_PROVIDER_INTENT_ACTION), 0);
-            List<String> payloads = new ArrayList<String>();
-            for (ResolveInfo provider : providers) {
-                boolean permissionGranted = true;
-                if (permission != null) {
-                    int result = context.getPackageManager().checkPermission(
-                            permission, provider.providerInfo.packageName);
-                    if (result != PackageManager.PERMISSION_GRANTED) {
-                        permissionGranted = false;
-                    }
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
+            return null;
+        }
+
+        List<ResolveInfo> providers;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+            providers = context.getPackageManager()
+              .queryIntentContentProviders(
+                new Intent(ADJUST_PREINSTALL_CONTENT_PROVIDER_INTENT_ACTION),
+                PackageManager.ResolveInfoFlags.of(0));
+        } else {
+            providers = context.getPackageManager()
+              .queryIntentContentProviders(
+                new Intent(ADJUST_PREINSTALL_CONTENT_PROVIDER_INTENT_ACTION), 0);
+        }
+
+        List<String> payloads = new ArrayList<String>();
+        for (ResolveInfo provider : providers) {
+            boolean permissionGranted = true;
+            if (permission != null) {
+                int result = context.getPackageManager().checkPermission(
+                        permission, provider.providerInfo.packageName);
+                if (result != PackageManager.PERMISSION_GRANTED) {
+                    permissionGranted = false;
                 }
+            }
 
-                if (permissionGranted) {
-                    String authority = provider.providerInfo.authority;
-                    if (authority != null && !authority.isEmpty()) {
-                        String contentUri = Util.formatString("content://%s/%s",
-                                                              authority, ADJUST_PREINSTALL_CONTENT_URI_PATH);
-                        String payload = readContentProvider(context, contentUri, packageName, logger);
-                        if (payload != null && !payload.isEmpty()) {
-                            payloads.add(payload);
-                        }
+            if (permissionGranted) {
+                String authority = provider.providerInfo.authority;
+                if (authority != null && !authority.isEmpty()) {
+                    String contentUri = Util.formatString("content://%s/%s",
+                                                          authority, ADJUST_PREINSTALL_CONTENT_URI_PATH);
+                    String payload = readContentProvider(context, contentUri, packageName, logger);
+                    if (payload != null && !payload.isEmpty()) {
+                        payloads.add(payload);
                     }
                 }
             }
+        }
 
-            if (!payloads.isEmpty()) {
-                return payloads;
-            }
+        if (!payloads.isEmpty()) {
+            return payloads;
         }
 
         return null;

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.31.1'
+    // implementation 'com.adjust.sdk:adjust-android:4.32.0'
 }
 
 // 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.31.1'
+    // implementation 'com.adjust.sdk:adjust-android:4.32.0'
 }
 
 // read local properties

diff --git a/Adjust/sdk-plugin-oaid/build.gradle b/Adjust/sdk-plugin-oaid/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.31.1'
+    // implementation 'com.adjust.sdk:adjust-android:4.32.0'
 }
 
 // read local properties

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.31.1'
+    // implementation 'com.adjust.sdk:adjust-android:4.32.0'
 }
 
 // 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.31.1'
+    // implementation 'com.adjust.sdk:adjust-android:4.32.0'
 }
 
 // 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.31.1'
+    // implementation 'com.adjust.sdk:adjust-android:4.32.0'
 }
 
 // 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.31.1';
+            return 'web-bridge4.32.0';
         }
     },
 

diff --git a/Adjust/sdk-plugin-webbridge/src/main/assets/adjust_third_party_sharing.js b/Adjust/sdk-plugin-webbridge/src/main/assets/adjust_third_party_sharing.js
@@ -1,10 +1,17 @@
 function AdjustThirdPartySharing(isEnabled) {
     this.isEnabled = isEnabled;
     this.granularOptions = [];
+    this.partnerSharingSettings = [];
 }
 
 AdjustThirdPartySharing.prototype.addGranularOption = function(partnerName, key, value) {
     this.granularOptions.push(partnerName);
     this.granularOptions.push(key);
     this.granularOptions.push(value);
 };
+
+AdjustThirdPartySharing.prototype.addPartnerSharingSetting = function(partnerName, key, value) {
+    this.partnerSharingSettings.push(partnerName);
+    this.partnerSharingSettings.push(key);
+    this.partnerSharingSettings.push(value);
+};
diff --git a/Adjust/sdk-plugin-webbridge/src/main/java/com/adjust/sdk/webbridge/AdjustBridgeInstance.java b/Adjust/sdk-plugin-webbridge/src/main/java/com/adjust/sdk/webbridge/AdjustBridgeInstance.java
@@ -667,13 +667,14 @@ public void trackThirdPartySharing(String adjustThirdPartySharingString) {
             Object isEnabledField =
                     jsonAdjustThirdPartySharing.get("isEnabled");
             Object granularOptionsField = jsonAdjustThirdPartySharing.get("granularOptions");
+            Object partnerSharingSettingsField = jsonAdjustThirdPartySharing.get("partnerSharingSettings");
 
             Boolean isEnabled = AdjustBridgeUtil.fieldToBoolean(isEnabledField);
 
             AdjustThirdPartySharing adjustThirdPartySharing =
                     new AdjustThirdPartySharing(isEnabled);
 
-            // Callback parameters
+            // Granular options
             String[] granularOptions =
                     AdjustBridgeUtil.jsonArrayToArray((JSONArray)granularOptionsField);
             if (granularOptions != null) {
@@ -685,6 +686,22 @@ public void trackThirdPartySharing(String adjustThirdPartySharingString) {
                 }
             }
 
+            // Partner sharing settings
+            String[] partnerSharingSettings =
+                    AdjustBridgeUtil.jsonArrayToArray((JSONArray)partnerSharingSettingsField);
+            if (partnerSharingSettings != null) {
+                for (int i = 0; i < partnerSharingSettings.length; i += 3) {
+                    String partnerName = partnerSharingSettings[i];
+                    String key = partnerSharingSettings[i + 1];
+                    Boolean value = AdjustBridgeUtil.fieldToBoolean(partnerSharingSettings[i + 2]);
+                    if (value != null) {
+                        adjustThirdPartySharing.addPartnerSharingSetting(partnerName, key, value);
+                    } else {
+                        AdjustFactory.getLogger().error("Cannot add partner sharing setting with non boolean value");
+                    }
+                }
+            }
+
             // Track ThirdPartySharing
             Adjust.trackThirdPartySharing(adjustThirdPartySharing);
         } catch (Exception e) {

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.31.1'
+    // implementation 'com.adjust.sdk:adjust-android:4.32.0'
 
     // Add xiaomi referrer lib via Maven.
     implementation 'com.miui.referrer:homereferrer:1.0.0.6'

diff --git a/Adjust/test-app-core/build.gradle b/Adjust/test-app-core/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.adjust.testapp"
         minSdkVersion 14
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }