Merge pull request #568 from adjust/v4333

Version 4.33.3
adjust · Feb 16, 2023 · 43b88df · 43b88df
2 parents eafa4e8 + f56e20a
commit 43b88df
Show file tree

Hide file tree

Showing 18 changed files with 86 additions and 74 deletions.
diff --git a/Adjust/build.gradle b/Adjust/build.gradle
@@ -9,7 +9,7 @@ ext {
     coreMinSdkVersion = 9
     coreCompileSdkVersion = 33
     coreTargetSdkVersion = 33
-    coreVersionName = '4.33.2'
+    coreVersionName = '4.33.3'
     defaultVersionCode = 1
     webbridgeMinSdkVersion = 17
     samsungReferrerMinSdkVersion = 18

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.2";
+        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.33.3";
 
         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.2";
+    String CLIENT_SDK = "android4.33.3";
     String LOGTAG = "Adjust";
     String REFTAG = "reftag";
     String INSTALL_REFERRER = "install_referrer";

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.2'
+    // implementation 'com.adjust.sdk:adjust-android:4.33.3'
 }
 
 // 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.2'
+    // implementation 'com.adjust.sdk:adjust-android:4.33.3'
 }
 
 // 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.2'
+    // implementation 'com.adjust.sdk:adjust-android:4.33.3'
     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
@@ -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.2'
+    // implementation 'com.adjust.sdk:adjust-android:4.33.3'
 
     // Add Samsung referrer lib via Maven.
 }

diff --git a/...k-plugin-samsung-referrer/src/main/java/com/adjust/sdk/samsung/SamsungReferrerClient.java b/...k-plugin-samsung-referrer/src/main/java/com/adjust/sdk/samsung/SamsungReferrerClient.java
@@ -14,42 +14,46 @@
 public class SamsungReferrerClient {
 
     public static ReferrerDetails getReferrer(Context context, final ILogger logger, long maxWaitTimeInMilli) {
-        final InstallReferrerClient referrerClient = InstallReferrerClient.newBuilder(context).build();
-        final BlockingQueue<ReferrerDetails> referrerDetailsHolder = new LinkedBlockingQueue<ReferrerDetails>(1);
-        referrerClient.startConnection(new InstallReferrerStateListener() {
-            @Override
-            public void onInstallReferrerSetupFinished(int responseCode) {
-                switch (responseCode) {
-                    case InstallReferrerClient.InstallReferrerResponse.OK:
-                        try {
-                            ReferrerDetails details = referrerClient.getInstallReferrer();
-                            referrerDetailsHolder.offer(details);
-                        } catch (Exception e) {
-                            logger.error("SamsungReferrer getInstallReferrer: " + e.getMessage());
-                            referrerDetailsHolder.offer(null);
-                        } finally {
-                            referrerClient.endConnection();
+        try {
+            final InstallReferrerClient referrerClient = InstallReferrerClient.newBuilder(context).build();
+            final BlockingQueue<ReferrerDetails> referrerDetailsHolder = new LinkedBlockingQueue<ReferrerDetails>(1);
+            referrerClient.startConnection(new InstallReferrerStateListener() {
+                @Override
+                public void onInstallReferrerSetupFinished(int responseCode) {
+                    try {
+                        switch (responseCode) {
+                            case InstallReferrerClient.InstallReferrerResponse.OK:
+                                try {
+                                    ReferrerDetails details = referrerClient.getInstallReferrer();
+                                    referrerDetailsHolder.offer(details);
+                                } catch (Exception e) {
+                                    logger.error("SamsungReferrer getInstallReferrer: " + e.getMessage());
+                                } finally {
+                                    referrerClient.endConnection();
+                                }
+                                break;
+                            case InstallReferrerClient.InstallReferrerResponse.FEATURE_NOT_SUPPORTED:
+                                logger.info("SamsungReferrer onInstallReferrerSetupFinished: FEATURE_NOT_SUPPORTED");
+                                break;
+                            case InstallReferrerClient.InstallReferrerResponse.SERVICE_UNAVAILABLE:
+                                logger.info("SamsungReferrer onInstallReferrerSetupFinished: SERVICE_UNAVAILABLE");
+                                break;
                         }
-                        break;
-                    case InstallReferrerClient.InstallReferrerResponse.FEATURE_NOT_SUPPORTED:
-                        logger.info("SamsungReferrer onInstallReferrerSetupFinished: FEATURE_NOT_SUPPORTED");
-                        break;
-                    case InstallReferrerClient.InstallReferrerResponse.SERVICE_UNAVAILABLE:
-                        logger.info("SamsungReferrer onInstallReferrerSetupFinished: SERVICE_UNAVAILABLE");
-                        break;
+                    } catch (Exception e) {
+                        logger.error("SamsungReferrer onInstallReferrerSetupFinished: " + e.getMessage());
+                    }
                 }
-            }
 
-            @Override
-            public void onInstallReferrerServiceDisconnected() {
-                referrerClient.endConnection();
-            }
-        });
+                @Override
+                public void onInstallReferrerServiceDisconnected() {
+                    referrerClient.endConnection();
+                }
+            });
 
-        try {
             return referrerDetailsHolder.poll(maxWaitTimeInMilli, TimeUnit.MILLISECONDS);
+
         } catch (Exception e) {
-            logger.error("Exception while waiting to get referrer: ", e.getMessage());
+            logger.error("Exception while getting referrer: ", e.getMessage());
         }
 
         return null;

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

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

diff --git a/.../sdk-plugin-xiaomi-referrer/src/main/java/com/adjust/sdk/xiaomi/XiaomiReferrerClient.java b/.../sdk-plugin-xiaomi-referrer/src/main/java/com/adjust/sdk/xiaomi/XiaomiReferrerClient.java
@@ -15,41 +15,43 @@
 public class XiaomiReferrerClient {
 
     public static GetAppsReferrerDetails getReferrer(Context context, final ILogger logger, long maxWaitTimeInMilli) {
-        final GetAppsReferrerClient referrerClient = new GetAppsReferrerClient.Builder(context).build();
-        final BlockingQueue<GetAppsReferrerDetails> referrerDetailsHolder = new LinkedBlockingQueue<GetAppsReferrerDetails>(1);
-        referrerClient.startConnection(new GetAppsReferrerStateListener() {
-            @Override
-            public void onGetAppsReferrerSetupFinished(int responseCode) {
-                switch(responseCode) {
-                    case GetAppsReferrerResponse.OK:
-                        try {
-                            GetAppsReferrerDetails getAppsReferrerDetails = referrerClient.getInstallReferrer();
-                            referrerDetailsHolder.offer(getAppsReferrerDetails);
-                        } catch (Exception e) {
-                            logger.error("XiaomiReferrer getInstallReferrer: " + e.getMessage());
-                            referrerDetailsHolder.offer(null);
+        try {
+            final GetAppsReferrerClient referrerClient = new GetAppsReferrerClient.Builder(context).build();
+            final BlockingQueue<GetAppsReferrerDetails> referrerDetailsHolder = new LinkedBlockingQueue<GetAppsReferrerDetails>(1);
+            referrerClient.startConnection(new GetAppsReferrerStateListener() {
+                @Override
+                public void onGetAppsReferrerSetupFinished(int responseCode) {
+                    try {
+                        switch (responseCode) {
+                            case GetAppsReferrerResponse.OK:
+                                try {
+                                    GetAppsReferrerDetails getAppsReferrerDetails = referrerClient.getInstallReferrer();
+                                    referrerDetailsHolder.offer(getAppsReferrerDetails);
+                                } catch (Exception e) {
+                                    logger.error("XiaomiReferrer getInstallReferrer: " + e.getMessage());
+                                }
+                                break;
+                            case GetAppsReferrerResponse.FEATURE_NOT_SUPPORTED:
+                                logger.info("XiaomiReferrer onGetAppsReferrerSetupFinished: FEATURE_NOT_SUPPORTED");
+                                break;
+                            case GetAppsReferrerResponse.SERVICE_UNAVAILABLE:
+                                logger.info("XiaomiReferrer onGetAppsReferrerSetupFinished: SERVICE_UNAVAILABLE");
+                                break;
                         }
-                        break;
-                    case GetAppsReferrerResponse.FEATURE_NOT_SUPPORTED:
-                        logger.info("XiaomiReferrer onGetAppsReferrerSetupFinished: FEATURE_NOT_SUPPORTED");
-                        referrerDetailsHolder.offer(null);
-                        break;
-                    case GetAppsReferrerResponse.SERVICE_UNAVAILABLE:
-                        logger.info("XiaomiReferrer onGetAppsReferrerSetupFinished: SERVICE_UNAVAILABLE");
-                        referrerDetailsHolder.offer(null);
-                        break;
+                    } catch (Exception e) {
+                        logger.error("XiaomiReferrer onGetAppsReferrerSetupFinished: " + e.getMessage());
+                    }
                 }
-            }
 
-            @Override
-            public void onGetAppsServiceDisconnected() {
-            }
-        });
+                @Override
+                public void onGetAppsServiceDisconnected() {
+                }
+            });
 
-        try {
             return referrerDetailsHolder.poll(maxWaitTimeInMilli, TimeUnit.MILLISECONDS);
+
         } catch (Exception e) {
-            logger.error("Exception while waiting to get referrer: ", e.getMessage());
+            logger.error("Exception while getting referrer: ", e.getMessage());
         }
 
         return null;

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.2";
+        clientSdk = "android4.33.3";
         suffix = "";
         attribution = new AdjustAttribution();
         playServices = true;

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### Version 4.33.3 (16th February 2023)
+#### Fixed
+- Added catching of exceptions in referrer plugins when thrown anytime while retrieving referrer.
+
+---
+
 ### Version 4.33.2 (7th December 2022)
 #### Fixed
 - Fixed Duplicate class error caused by compiler generating package `a.a`.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.33.2
+4.33.3