[AND-209] Update stream-android-push to v1.3.0 and update related dep…

…endencies. (#5573) * [AND-209] Update stream-push-android to v1.3.0 and update related dependencies. * [AND-209] Update CHANGELOG.md. --------- Co-authored-by: PetarVelikov <[email protected]>
GetStream · Jan 22, 2025 · 879f0fa · 879f0fa
1 parent dca0dc0
commit 879f0fa
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 ### 🐞 Fixed
 
 ### ⬆️ Improved
+- Update compileSdk to 35 (#5573)[https://github.com/GetStream/stream-chat-android/pull/5573]
+- Update dependency versions:
+  - AndroidX Ktx 1.15.0 (#5573)[https://github.com/GetStream/stream-chat-android/pull/5573]
+  - Stream Push 1.3.0 (#5573)[https://github.com/GetStream/stream-chat-android/pull/5573]
 
 ### ✅ Added
 

diff --git a/buildSrc/src/main/kotlin/io/getstream/chat/android/Configuration.kt b/buildSrc/src/main/kotlin/io/getstream/chat/android/Configuration.kt
@@ -1,7 +1,7 @@
 package io.getstream.chat.android
 
 object Configuration {
-    const val compileSdk = 34
+    const val compileSdk = 35
     const val targetSdk = 34
     const val sampleTargetSdk = 34
     const val minSdk = 21

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ androidxComposeMaterial3 = "1.3.1"
 androidxComposeMaterial3Adaptive = "1.0.0"
 androidxCoreTest = "2.2.0"
 androidxFragment = "1.8.5"
-androidxKtx = "1.13.1"
+androidxKtx = "1.15.0"
 androidxLifecycle = "2.8.7"
 androidxNavigation = "2.8.4"
 androidxPreferences = "1.2.1"
@@ -79,7 +79,7 @@ shot = "6.1.0"
 sonarqube = "6.0.1.5171"
 spotless = "6.20.0"
 streamLog = "1.3.1"
-streamPush = "1.1.9"
+streamPush = "1.3.0"
 streamResult = "1.3.2"
 testParameterInjector = "1.12"
 threetenbp = "1.7.0"

diff --git a/stream-chat-android-client/src/main/AndroidManifest.xml b/stream-chat-android-client/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
     <application>
 
         <provider
-            android:name="io.getstream.android.push.delegate.PushDelegateProvider"
+            android:name="io.getstream.android.push.delegate.AndroidPushDelegateProvider"
             android:authorities="${applicationId}.io.getstream.android.push"
             android:exported="false"
             tools:node="merge"

diff --git a/...-client/src/main/java/io/getstream/chat/android/client/notifications/ChatNotifications.kt b/...-client/src/main/java/io/getstream/chat/android/client/notifications/ChatNotifications.kt
@@ -72,7 +72,7 @@ internal class ChatNotificationsImpl constructor(
         permissionManager
             .takeIf { notificationConfig.requestPermissionOnAppLaunch() }
             ?.start()
-        notificationConfig.pushDeviceGenerators.firstOrNull { it.isValidForThisDevice(context) }
+        notificationConfig.pushDeviceGenerators.firstOrNull { it.isValidForThisDevice() }
             ?.let {
                 it.onPushDeviceGeneratorSelected()
                 it.asyncGeneratePushDevice { setDevice(it.toDevice()) }

diff --git a/...d-client/src/main/java/io/getstream/chat/android/client/notifications/ChatPushDelegate.kt b/...d-client/src/main/java/io/getstream/chat/android/client/notifications/ChatPushDelegate.kt
@@ -16,7 +16,6 @@
 
 package io.getstream.chat.android.client.notifications
 
-import android.content.Context
 import io.getstream.android.push.PushDevice
 import io.getstream.android.push.PushProvider
 import io.getstream.android.push.delegate.PushDelegate
@@ -30,10 +29,9 @@ private typealias DevicePushProvider = io.getstream.chat.android.models.PushProv
 /**
  * Internal class that handle PN stuff.
  * It is declared in our Android Manifest and is used by reflection.
- *
  */
 @Suppress("Unused")
-internal class ChatPushDelegate(context: Context) : PushDelegate(context) {
+internal class ChatPushDelegate : PushDelegate() {
 
     private val expectedKeys = hashSetOf(KEY_CHANNEL_ID, KEY_MESSAGE_ID, KEY_CHANNEL_TYPE, KEY_GETSTREAM)
 

diff --git a/...droid-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ChatHelper.kt b/...droid-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ChatHelper.kt
@@ -50,7 +50,12 @@ object ChatHelper {
     fun initializeSdk(context: Context, apiKey: String, baseUrl: String? = null) {
         Log.d(TAG, "[init] apiKey: $apiKey")
         val notificationConfig = NotificationConfig(
-            pushDeviceGenerators = listOf(FirebasePushDeviceGenerator(providerName = "Firebase")),
+            pushDeviceGenerators = listOf(
+                FirebasePushDeviceGenerator(
+                    context = context,
+                    providerName = "Firebase",
+                ),
+            ),
             autoTranslationEnabled = ChatApp.autoTranslationEnabled,
         )
         val notificationHandler = NotificationHandlerFactory.createNotificationHandler(

diff --git a/...m-chat-android-docs/src/main/java/io/getstream/chat/docs/java/client/docusaurus/Push.java b/...m-chat-android-docs/src/main/java/io/getstream/chat/docs/java/client/docusaurus/Push.java
@@ -8,6 +8,7 @@
 import androidx.annotation.NonNull;
 import androidx.core.app.NotificationCompat;
 
+import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 import com.huawei.hms.push.HmsMessageService;
@@ -178,7 +179,9 @@ public void configureFirebaseNotifications(Context context) {
             boolean ignorePushMessagesWhenUserOnline = true;
             List<PushDeviceGenerator> pushDeviceGeneratorList = Collections.singletonList(
                     new FirebasePushDeviceGenerator(
-                            "providerName"
+                            FirebaseMessaging.getInstance(),
+                            "providerName",
+                            context
                     )
             );
             NotificationConfig notificationConfig = new NotificationConfig(pushNotificationEnabled, ignorePushMessagesWhenUserOnline, pushDeviceGeneratorList);

diff --git a/...chat-android-docs/src/main/kotlin/io/getstream/chat/docs/kotlin/client/docusaurus/Push.kt b/...chat-android-docs/src/main/kotlin/io/getstream/chat/docs/kotlin/client/docusaurus/Push.kt
@@ -155,7 +155,12 @@ class Push {
          */
         fun configureFirebaseNotifications(context: Context) {
             val notificationConfig = NotificationConfig(
-                pushDeviceGenerators = listOf(FirebasePushDeviceGenerator(providerName = "providerName")),
+                pushDeviceGenerators = listOf(
+                    FirebasePushDeviceGenerator(
+                        context = context,
+                        providerName = "providerName"
+                    )
+                ),
             )
             ChatClient.Builder("apiKey", context)
                 .notifications(notificationConfig)

diff --git a/...droid-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/utils/ContextUtils.kt b/...droid-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/utils/ContextUtils.kt
@@ -31,5 +31,5 @@ public fun Context.isPermissionDeclared(permission: String): Boolean {
     return packageManager
         .getPackageInfo(packageName, PackageManager.GET_PERMISSIONS)
         .requestedPermissions
-        .contains(permission)
+        ?.contains(permission) == true
 }
diff --git a/...ponents-sample/src/main/kotlin/io/getstream/chat/ui/sample/application/ChatInitializer.kt b/...ponents-sample/src/main/kotlin/io/getstream/chat/ui/sample/application/ChatInitializer.kt
@@ -55,7 +55,10 @@ class ChatInitializer(
         val notificationConfig =
             NotificationConfig(
                 pushDeviceGenerators = listOf(
-                    FirebasePushDeviceGenerator(providerName = "Firebase"),
+                    FirebasePushDeviceGenerator(
+                        context = context,
+                        providerName = "Firebase",
+                    ),
                     HuaweiPushDeviceGenerator(
                         context = context,
                         appId = ApplicationConfigurator.HUAWEI_APP_ID,

diff --git a/...oid-ui-components/src/main/kotlin/io/getstream/chat/android/ui/utils/PermissionChecker.kt b/...oid-ui-components/src/main/kotlin/io/getstream/chat/android/ui/utils/PermissionChecker.kt
@@ -30,6 +30,7 @@ import com.permissionx.guolindev.PermissionX
 import io.getstream.chat.android.core.internal.InternalStreamChatApi
 import io.getstream.chat.android.ui.common.R
 import io.getstream.chat.android.ui.common.permissions.Permissions
+import io.getstream.chat.android.ui.common.utils.isPermissionDeclared
 import io.getstream.chat.android.ui.utils.extensions.activity
 import io.getstream.chat.android.ui.utils.extensions.dpToPxPrecise
 import io.getstream.chat.android.uiutils.util.openSystemSettings
@@ -57,7 +58,7 @@ public class PermissionChecker {
      * False in another case
      */
     public fun isNeededToRequestForCameraPermissions(context: Context): Boolean =
-        isPermissionContainedOnManifest(context, Manifest.permission.CAMERA) && !isGrantedCameraPermissions(context)
+        context.isPermissionDeclared(Manifest.permission.CAMERA) && !isGrantedCameraPermissions(context)
 
     /**
      * Requests the correct visual media permissions (image/video) based on the device's API level.
@@ -197,20 +198,6 @@ public class PermissionChecker {
         )
     }
 
-    /**
-     * Check if the [permission] was declared on the App Manifest
-     *
-     * @param context of the current Application
-     * @param permission name to be checked
-     *
-     * @return True if the permission is present on the App Manifest
-     */
-    private fun isPermissionContainedOnManifest(context: Context, permission: String): Boolean =
-        context.packageManager
-            .getPackageInfo(context.packageName, PackageManager.GET_PERMISSIONS)
-            .requestedPermissions
-            .contains(permission)
-
     @Suppress("LongParameterList")
     private fun checkPermissions(
         view: View,