release: SDK 1.19.2

Author: abarisain

README.md

@@ -1,4 +1,4 @@
-<img src="https://static.batch.com/documentation/Readmes/logo_batch_full_178@2x.png" srcset="https://static.batch.com/documentation/Readmes/logo_batch_full_178.png 1x" width="178" height="68" alt="Batch Logo" />
+<img src="https://static.batch.com/documentation/Readmes/logo_batch_full_178@2x.png" srcset="https://static.batch.com/documentation/Readmes/logo_batch_full_178.png 1x" width="178" height="80" alt="Batch Logo" />
 
 # Batch Android SDK
 

Sources/.gitignore

@@ -10,6 +10,7 @@
 # Recommended ignore from Gradle
 **/.idea/dataSources.*
 **/.idea/inspectionProfiles
+**/.idea/deploymentTargetDropDown.xml
 **/.idea/misc.xml
 **/.idea/gradle.xml
 **/.idea/modules.xml

Sources/.idea/codeStyles/Project.xml

@@ -16,18 +16,18 @@ ext {
 }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
     defaultPublishConfig "release"
 
     resourcePrefix "com_batchsdk_"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
-        versionName "1.19.1"
+        versionName "1.19.2"
         buildConfigField "String", SDK_VERSION, "\"$versionName\""
-        buildConfigField "Integer", API_LEVEL, '50'
+        buildConfigField "Integer", API_LEVEL, '51'
         buildConfigField "Integer", MESSAGING_API_LEVEL, '12'
         buildConfigField "String", WS_DOMAIN, '"ws.batch.com"'
 
@@ -110,7 +110,7 @@ dependencies {
     compileOnly "com.google.android.gms:play-services-location:$playServicesVersion"
     compileOnly "com.google.android.gms:play-services-nearby:$playServicesVersion"
     compileOnly 'com.google.android.play:core:1.9.0'
-    compileOnly "com.google.firebase:firebase-core:17.4.3"
+    compileOnly "com.google.firebase:firebase-iid:21.1.0"
     compileOnly "com.google.firebase:firebase-messaging:22.0.0"
     compileOnly project(':sdk-stubs')
     compileOnly project(':sdk-processor')
@@ -124,6 +124,7 @@ dependencies {
 
     androidTestImplementation 'junit:junit:4.12'
     androidTestImplementation "androidx.annotation:annotation:$androidXLibraryVersion"
+    androidTestImplementation 'androidx.test:core-ktx:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

Sources/.idea/runConfigurations/sample_tests_firebase_lab.xml

@@ -30,6 +30,11 @@
             android:theme="@style/com_batchsdk_ActionActivityTheme"
             android:exported="false" />
 
+        <activity
+            android:name=".BatchPermissionActivity"
+            android:theme="@style/com_batchsdk_PermissionActivityTheme"
+            android:exported="false" />
+
         <activity
             android:name=".debug.BatchDebugActivity"
             android:theme="@style/com_batchsdk_DebugActivityTheme"

Sources/sdk/build.gradle

@@ -118,11 +118,6 @@ public final class Batch {
      */
     private static boolean didLogOptOutWarning = false;
 
-    /**
-     * Last notification authorization status
-     */
-    private static Boolean lastNotificationAuthorizationStatus = null;
-
     /**
      * Default placement
      */
@@ -1139,6 +1134,17 @@ public static void setNotificationInterceptor(@Nullable BatchNotificationInterce
         public static void refreshRegistration() {
             PushModuleProvider.get().refreshRegistration();
         }
+
+        /**
+         * Request the notification runtime permission.
+         * Android 13 (API 33) introduced a new runtime permission for notifications called POST_NOTIFICATIONS.
+         * Without this permission, apps on Android 13 cannot show notifications.
+         * This method does nothing on Android 12 and lower, or if your application does not target API 33 or higher.
+         * @param context requesting the permission
+         */
+        public static void requestNotificationPermission(@NonNull Context context) {
+            PushModuleProvider.get().requestNotificationPermission(context);
+        }
     }
 
     // ---------------------------------------------------->
@@ -2180,7 +2186,7 @@ else if (lastStop == null && state == State.READY) {
                     }
 
                     // Check if the notification authorization status changed from a previous value
-                    checkForNotificationAuthorizationChange(context);
+                    NotificationAuthorizationStatus.checkForNotificationAuthorizationChange(context);
 
                     newIntent = null;
                 }
@@ -2616,44 +2622,6 @@ private static void updateVersionManagement() {
         }
     }
 
-    private static void checkForNotificationAuthorizationChange(@NonNull Context context) {
-        boolean hasNotificationAuthorization = NotificationAuthorizationStatus.canAppShowNotifications(
-            context,
-            BatchNotificationChannelsManagerProvider.get()
-        );
-
-        // First time, store it, as the start will send it
-        // If it changes, force a Push query
-        if (lastNotificationAuthorizationStatus == null) {
-            lastNotificationAuthorizationStatus = hasNotificationAuthorization;
-            return;
-        }
-
-        if (lastNotificationAuthorizationStatus != hasNotificationAuthorization) {
-            lastNotificationAuthorizationStatus = hasNotificationAuthorization;
-            Logger.internal(
-                "Notification Authorization changed (is now " + (hasNotificationAuthorization ? "true" : "false") + ")"
-            );
-
-            RuntimeManager runtimeManager = RuntimeManagerProvider.get();
-            boolean sdkReady = runtimeManager.runIfReady(() -> {
-                // Trigger a push token webservice
-                Registration registration = PushModuleProvider.get().getRegistration(context);
-                if (registration == null) {
-                    Logger.internal(
-                        "Notif. Authorization changed but no registration is available. Not sending update to the server."
-                    );
-                    return;
-                }
-                WebserviceLauncher.launchPushWebservice(runtimeManager, registration);
-            });
-
-            if (!sdkReady) {
-                Logger.internal("Notif. Authorization changed but SDK isn't ready. Not sending update to the server.");
-            }
-        }
-    }
-
     /**
      * Called when the lib has been updated
      *

Sources/sdk/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 package com.batch.android;
 
+import android.annotation.SuppressLint;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
@@ -81,18 +82,19 @@ String getChannelId(@Nullable BatchPushPayload payload) {
         return channelId;
     }
 
-    private boolean shouldRegisterDefaultChannel() {
-        return channelOverride == null;
+    private boolean isChannelIdOverridden() {
+        return channelOverride != null;
     }
 
-    void registerBatchChannelIfNeeded(Context c, boolean forceIfOverridden) {
-        if (!forceIfOverridden && !shouldRegisterDefaultChannel()) {
-            Logger.internal(PushModule.TAG, "Channel ID overriden, not registering Batch's channel.");
+    void registerBatchChannelIfNeeded(Context c) {
+        if (isChannelIdOverridden()) {
+            Logger.internal(PushModule.TAG, "Channel ID overridden, not registering Batch's channel.");
             return;
         }
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
             Logger.internal(PushModule.TAG, "Registering default Batch notification channel");
             //try {
+            @SuppressLint("WrongConstant")
             NotificationChannel channel = new NotificationChannel(
                 DEFAULT_CHANNEL_ID,
                 getBatchChannelName(),
@@ -234,6 +236,7 @@ public static boolean openSystemChannelSettings(@NonNull Context context, @NonNu
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
             try {
                 Intent intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS);
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 intent.putExtra(Settings.EXTRA_CHANNEL_ID, channelId);
                 intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.getPackageName());
                 context.startActivity(intent);

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

@@ -13,11 +13,7 @@ public static String getChannelId(BatchNotificationChannelsManager manager) {
         return manager.getChannelId(null);
     }
 
-    public static void registerBatchChannelIfNeeded(
-        BatchNotificationChannelsManager manager,
-        Context context,
-        boolean forceIfOverridden
-    ) {
-        manager.registerBatchChannelIfNeeded(context, forceIfOverridden);
+    public static void registerBatchChannelIfNeeded(BatchNotificationChannelsManager manager, Context context) {
+        manager.registerBatchChannelIfNeeded(context);
     }
 }