release: SDK 1.18.1

BatchLabs · Nov 26, 2021 · 5ebdd80 · 5ebdd80
1 parent 368a01b
commit 5ebdd80
Show file tree

Hide file tree

Showing 7 changed files with 9,005 additions and 11 deletions.
diff --git a/Sources/sdk/build.gradle b/Sources/sdk/build.gradle
@@ -26,7 +26,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 31
         versionCode 1
-        versionName "1.18.0"
+        versionName "1.18.1"
         buildConfigField "String", SDK_VERSION, "\"$versionName\""
         buildConfigField "Integer", API_LEVEL, '40'
         buildConfigField "Integer", MESSAGING_API_LEVEL, '11'

diff --git a/Sources/sdk/src/main/java/com/batch/android/BatchMessagingWebViewJavascriptBridge.java b/Sources/sdk/src/main/java/com/batch/android/BatchMessagingWebViewJavascriptBridge.java
@@ -198,7 +198,7 @@ protected String getAdvertisingIDValue()
     {
         try {
             AdvertisingID advertisingID = Batch.getAdvertisingID();
-            if (advertisingID.isNotNull()) {
+            if (advertisingID != null && advertisingID.isNotNull()) {
                 return advertisingID.get();
             }
         } catch (IllegalArgumentException ignored) {

diff --git a/Sources/sdk/src/main/java/com/batch/android/BatchWebservice.java b/Sources/sdk/src/main/java/com/batch/android/BatchWebservice.java
@@ -210,18 +210,20 @@ protected PostDataProvider<JSONObject> getPostDataProvider()
                 } else if (SystemParameterShortName.ADVERTISING_ID.shortName.equals(parameter)) {
                     if (Batch.shouldUseAdvertisingID()) {
                         AdvertisingID advertisingID = Batch.getAdvertisingID();
-
-                        boolean isIdfaAvailable = advertisingID.isReady() && advertisingID.isNotNull();
-                        if (isIdfaAvailable) {
-                            ids.put(parameter, advertisingID.get());
+                        if (advertisingID != null) {
+                            boolean isIdfaAvailable = advertisingID.isReady() && advertisingID.isNotNull();
+                            if (isIdfaAvailable) {
+                                ids.put(parameter, advertisingID.get());
+                            }
                         }
                     }
                 } else if (SystemParameterShortName.ADVERTISING_ID_OPTIN.shortName.equals(parameter)) {
                     AdvertisingID advertisingID = Batch.getAdvertisingID();
-
-                    boolean isIdfaAvailable = advertisingID.isReady();
-                    if (isIdfaAvailable) {
-                        ids.put(parameter, !advertisingID.isLimited());
+                    if (advertisingID != null) {
+                        boolean isIdfaAvailable = advertisingID.isReady();
+                        if (isIdfaAvailable) {
+                            ids.put(parameter, !advertisingID.isLimited());
+                        }
                     }
                 } else if (SystemParameterShortName.BRIDGE_VERSION.shortName.equals(parameter)) {
                     String val = SystemParameterHelper.getBridgeVersion();

diff --git a/Sources/sdk/src/main/java/com/batch/android/module/TrackerModule.java b/Sources/sdk/src/main/java/com/batch/android/module/TrackerModule.java
@@ -379,7 +379,7 @@ private JSONObject makeOptBaseEventData(Context context,
             data.put("cus", customID);
         }
 
-        if (Batch.shouldUseAdvertisingID() && advertisingID.isNotNull()) {
+        if (Batch.shouldUseAdvertisingID() && advertisingID != null && advertisingID.isNotNull()) {
             try {
                 String idv = advertisingID.get();
                 if (idv != null) {

diff --git a/proguard-mappings/1.18.1/checksum.md5 b/proguard-mappings/1.18.1/checksum.md5
@@ -0,0 +1 @@
+MD5 (public-sdk/Batch.aar) = 73ebcd949787d6bcda30abdf760f16d4
diff --git a/proguard-mappings/1.18.1/checksum.sha b/proguard-mappings/1.18.1/checksum.sha
@@ -0,0 +1 @@
+79507740866ba21c2011f5a2d85a61df3330b655  public-sdk/Batch.aar
diff --git a/proguard-mappings/1.18.1/mapping.txt b/proguard-mappings/1.18.1/mapping.txt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		MD5 (public-sdk/Batch.aar) = 73ebcd949787d6bcda30abdf760f16d4
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		79507740866ba21c2011f5a2d85a61df3330b655 public-sdk/Batch.aar