release: SDK 1.17.3

Author: abarisain

Sources/sdk/build.gradle

@@ -26,7 +26,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 30
         versionCode 1
-        versionName "1.17.2"
+        versionName "1.17.3"
         buildConfigField "String", SDK_VERSION, "\"$versionName\""
         buildConfigField "Integer", API_LEVEL, '36'
         buildConfigField "Integer", MESSAGING_API_LEVEL, '10'
@@ -64,8 +64,8 @@ android {
 
     lintOptions {
         abortOnError true
-        warningsAsErrors true
         baseline file("lint-baseline.xml")
+        lintConfig file("lint.xml")
     }
 
     testOptions {

Sources/sdk/lint-baseline.xml

@@ -1,15 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.1" client="gradle" variant="debug" version="4.1.1">
-
-    <issue
-        id="KtxExtensionAvailable"
-        message="Add suffix `-ktx` to enable the Kotlin extensions for this library"
-        errorLine1="    api &quot;androidx.core:core:$androidXLibraryVersion&quot;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="107"
-            column="5"/>
-    </issue>
+<issues format="5" by="lint 4.2.0" client="gradle" variant="debug" version="4.2.0">
 
 </issues>

Sources/sdk/lint.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
-	<issue id="GradleDependency">
-		<ignore path="build.gradle" />
-	</issue>
+	<issue id="OldTargetApi" severity="warning" />
+
+	<!-- android.lintOptions.warningsAsErrors should do this but ... IDK -->
+	<!--<issue id="all" severity="error" /> -->
 </lint>

Sources/sdk/src/main/java/com/batch/android/BatchNotificationAction.java

@@ -1,5 +1,6 @@
 package com.batch.android;
 
+import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -71,12 +72,16 @@ public class BatchNotificationAction
      * @return A list of {@link NotificationCompat.Action} instances matching the provided {@link BatchNotificationAction},
      * if they've been successfully converted
      */
+    @SuppressLint("UnspecifiedImmutableFlag")
     @NonNull
     public static List<NotificationCompat.Action> getSupportActions(@NonNull Context context,
                                                                     @NonNull List<BatchNotificationAction> batchActions,
                                                                     @Nullable BatchPushPayload pushPayload,
                                                                     @Nullable Integer notificationId)
     {
+        // UnspecifiedImmutableFlag is suppressed as the linter can't recognize our conditional
+        // Android M immutability flag.
+
         if (context == null) {
             throw new IllegalArgumentException("Context cannot be null");
         }
@@ -109,6 +114,8 @@ public static List<NotificationCompat.Action> getSupportActions(@NonNull Context
 
             int actionIntentFlags = PendingIntent.FLAG_ONE_SHOT;
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                // Remove @SuppressLint("UnspecifiedImmutableFlag") if you ever delete this line,
+                // so that the linter can warn appropriately
                 actionIntentFlags = actionIntentFlags | PendingIntent.FLAG_IMMUTABLE;
             }
 

Sources/sdk/src/main/java/com/batch/android/BatchPushNotificationPresenter.java

@@ -1,5 +1,6 @@
 package com.batch.android;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Notification;
 import android.app.PendingIntent;
@@ -392,6 +393,10 @@ public static void presentNotification(Context context,
             contentIntentFlags = contentIntentFlags | PendingIntent.FLAG_IMMUTABLE;
         }
 
+        // UnspecifiedImmutableFlag is suppressed as the linter can't recognize our conditional
+        // Android M immutability flag.
+
+        @SuppressLint("UnspecifiedImmutableFlag")
         PendingIntent contentIntent = PendingIntent.getActivity(context,
                 0,
                 launchIntent,
@@ -414,6 +419,10 @@ public static void presentNotification(Context context,
             deleteIntentFlags = deleteIntentFlags | PendingIntent.FLAG_IMMUTABLE;
         }
 
+        // UnspecifiedImmutableFlag is suppressed as the linter can't recognize our conditional
+        // Android M immutability flag.
+
+        @SuppressLint("UnspecifiedImmutableFlag")
         PendingIntent deleteIntent =
                 PendingIntent.getBroadcast(context.getApplicationContext(),
                         notificationId, dismissIntent, deleteIntentFlags);

Sources/sdk/src/main/java/com/batch/android/module/EventDispatcherModule.java

@@ -28,7 +28,7 @@ public class EventDispatcherModule extends BatchModule
             "com.batch.android.eventdispatcher.DispatcherRegistrar";
     private static final String COMPONENT_KEY_PREFIX = "com.batch.android.eventdispatcher:";
 
-    private Set<BatchEventDispatcher> eventDispatchers = new LinkedHashSet<>();
+    private final Set<BatchEventDispatcher> eventDispatchers = new LinkedHashSet<>();
     private OptOutModule optOutModule;
 
     private boolean isContextLoaded = false;
@@ -56,20 +56,6 @@ public int getState()
         return 1;
     }
 
-    @Override
-    public void batchDidStop()
-    {
-        clear();
-    }
-
-    public void clear()
-    {
-        synchronized (eventDispatchers) {
-            eventDispatchers.clear();
-            isContextLoaded = false;
-        }
-    }
-
     private void printLoadedDispatcher(@NonNull String name)
     {
         Logger.internal(TAG,
@@ -111,11 +97,13 @@ public void loadDispatcherFromContext(Context context)
             return;
         }
 
-        // Ensure once because of NotificationPresenter
-        if (isContextLoaded) {
-            return;
+        synchronized (eventDispatchers) {
+            // Ensure once because of NotificationPresenter
+            if (isContextLoaded) {
+                return;
+            }
+            isContextLoaded = true;
         }
-        isContextLoaded = true;
 
         List<String> registrarNames = DiscoveryServiceHelper.getComponentNames(context,
                 DispatcherDiscoveryService.class,

Sources/sdk/src/main/java/com/batch/android/push/formats/APENFormat.java

@@ -1,5 +1,6 @@
 package com.batch.android.push.formats;
 
+import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.view.View;
@@ -113,6 +114,7 @@ ImageView.ScaleType getImageScaleType()
         return imageScaleType;
     }
 
+    @SuppressLint("AnnotateVersionCheck")
     public static boolean isSupported()
     {
         return android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;

proguard-mappings/1.17.3/checksum.md5

@@ -0,0 +1 @@
+MD5 (public-sdk/Batch.aar) = 218df77fae5bf42bcc8f1ab08e9d7fca

proguard-mappings/1.17.3/checksum.sha

@@ -0,0 +1 @@
+a819def06da69a82082a9d164df22d6f6cd33c8a  public-sdk/Batch.aar