Merge branch 'develop'

Author: aleksandar-apostolov

buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt

@@ -6,11 +6,11 @@ object Configuration {
     const val minSdk = 24
     const val majorVersion = 0
     const val minorVersion = 5
-    const val patchVersion = 4
+    const val patchVersion = 5
     const val versionName = "$majorVersion.$minorVersion.$patchVersion"
-    const val versionCode = 18
+    const val versionCode = 19
     const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
     const val artifactGroup = "io.getstream"
-    const val streamVideoCallGooglePlayVersion = "1.0.6"
+    const val streamVideoCallGooglePlayVersion = "1.0.7"
     const val streamWebRtcVersionName = "1.1.1"
 }

docusaurus/docs/Android/02-tutorials/01-video-calling.mdx

@@ -31,7 +31,7 @@ If you're new to android, note that there are 2 `build.gradle` files, you want t
 ```kotlin
 dependencies {
     // Stream Video Compose SDK
-    implementation("io.getstream:stream-video-android-ui-compose:0.5.4")
+    implementation("io.getstream:stream-video-android-ui-compose:0.5.5")
 
     // Optionally add Jetpack Compose if Android studio didn't automatically include them
     implementation(platform("androidx.compose:compose-bom:2023.08.00"))

docusaurus/docs/Android/02-tutorials/02-audio-room.mdx

@@ -35,7 +35,7 @@ If you're new to android, note that there are 2 `build.gradle` files, you want t
 ```groovy
 dependencies {
     // Stream Video Compose SDK
-    implementation("io.getstream:stream-video-android-ui-compose:0.5.4")
+    implementation("io.getstream:stream-video-android-ui-compose:0.5.5")
 
     // Jetpack Compose (optional/ android studio typically adds them when you create a new project)
     implementation(platform("androidx.compose:compose-bom:2023.08.00"))

docusaurus/docs/Android/02-tutorials/03-livestream.mdx

@@ -35,7 +35,7 @@ If you're new to android, note that there are 2 `build.gradle` files, you want t
 ```kotlin
 dependencies {
     // Stream Video Compose SDK
-    implementation("io.getstream:stream-video-android-ui-compose:0.5.4")
+    implementation("io.getstream:stream-video-android-ui-compose:0.5.5")
 
     // Jetpack Compose (optional/ android studio typically adds them when you create a new project)
     implementation(platform("androidx.compose:compose-bom:2023.08.00"))

docusaurus/docs/Android/06-advanced/07-chat-with-video.mdx

@@ -31,7 +31,7 @@ Let the project sync. It should have all the dependencies required for you to fi
 ```groovy
 dependencies {
     // Stream Video Compose SDK
-    implementation("io.getstream:stream-video-android-ui-compose:0.5.4")
+    implementation("io.getstream:stream-video-android-ui-compose:0.5.5")
     
     // Stream Chat
     implementation(libs.stream.chat.compose)

gradle/libs.versions.toml

@@ -3,44 +3,44 @@ androidGradlePlugin = "8.2.2"
 cameraCamera2 = "1.3.0"
 spotless = "6.21.0"
 nexusPlugin = "1.3.0"
-kotlin = "1.9.22"
-ksp = "1.9.22-1.0.17"
-kotlinSerialization = "1.6.2"
+kotlin = "1.9.23"
+ksp = "1.9.23-1.0.19"
+kotlinSerialization = "1.6.3"
 kotlinSerializationConverter = "1.0.0"
 kotlinxCoroutines = "1.8.0"
 
-kotlinDokka = "1.9.10"
+kotlinDokka = "1.9.20"
 jvmTarget = "11"
 
 androidxMaterial = "1.11.0"
 androidxAppCompat = "1.6.1"
 androidxCore = "1.12.0"
-androidxAnnotation = "1.7.0"
-androidxLifecycle = "2.6.2"
+androidxAnnotation = "1.7.1"
+androidxLifecycle = "2.7.0"
 androidxStartup = "1.1.1"
-androidxActivity = "1.8.0"
+androidxActivity = "1.8.2"
 androidxDataStore = "1.0.0"
 googleService = "4.3.14"
 
-androidxComposeBom = "2024.02.02"
-androidxComposeCompiler = "1.5.10"
+androidxComposeBom = "2024.03.00"
+androidxComposeCompiler = "1.5.11"
 androidxComposeTracing = "1.0.0-beta01"
 androidxHiltNavigation = "1.2.0"
-androidxComposeNavigation = "2.7.6"
+androidxComposeNavigation = "2.7.7"
 composeStableMarker = "1.0.2"
 
-coil = "2.5.0"
-landscapist = "2.3.1"
+coil = "2.6.0"
+landscapist = "2.3.2"
 accompanist = "0.32.0"
 telephoto = "0.3.0"
 audioswitch = "1.1.8"
 libyuv = "0.30.0"
 
 wire = "4.7.0"
 okhttp = "4.12.0"
-retrofit = "2.9.0"
-moshi = "1.15.0"
-threetenAbp = "1.4.6"
+retrofit = "2.11.0"
+moshi = "1.15.1"
+threetenAbp = "1.4.7"
 tink = "1.9.0"
 turbine = "0.13.0"
 
@@ -71,8 +71,8 @@ installReferrer = "2.2"
 playAuth = "20.7.0"
 playAppUpdate = "2.1.0"
 
-hilt = "2.50"
-leakCanary = "2.12"
+hilt = "2.51.1"
+leakCanary = "2.13"
 binaryCompatabilityValidator = "0.14.0"
 playPublisher = "3.8.4"
 

stream-video-android-core/api/stream-video-android-core.api

@@ -4075,11 +4075,12 @@ public final class io/getstream/video/android/core/model/VisibilityOnScreenState
 
 public class io/getstream/video/android/core/notifications/DefaultNotificationHandler : io/getstream/android/push/permissions/NotificationPermissionHandler, io/getstream/video/android/core/notifications/NotificationHandler {
 	public static final field Companion Lio/getstream/video/android/core/notifications/DefaultNotificationHandler$Companion;
-	public fun <init> (Landroid/app/Application;Lio/getstream/android/push/permissions/NotificationPermissionHandler;)V
-	public synthetic fun <init> (Landroid/app/Application;Lio/getstream/android/push/permissions/NotificationPermissionHandler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Landroid/app/Application;Lio/getstream/android/push/permissions/NotificationPermissionHandler;Z)V
+	public synthetic fun <init> (Landroid/app/Application;Lio/getstream/android/push/permissions/NotificationPermissionHandler;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getChannelDescription ()Ljava/lang/String;
 	public fun getChannelId ()Ljava/lang/String;
 	public fun getChannelName ()Ljava/lang/String;
+	public final fun getHideRingingNotificationInForeground ()Z
 	public fun getOngoingCallNotification (Lio/getstream/video/android/model/StreamCallId;)Landroid/app/Notification;
 	public fun getRingingCallNotification (Lio/getstream/video/android/core/RingingState;Lio/getstream/video/android/model/StreamCallId;Ljava/lang/String;)Landroid/app/Notification;
 	public fun onLiveCall (Lio/getstream/video/android/model/StreamCallId;Ljava/lang/String;)V
@@ -4096,14 +4097,16 @@ public final class io/getstream/video/android/core/notifications/DefaultNotifica
 
 public final class io/getstream/video/android/core/notifications/NotificationConfig {
 	public fun <init> ()V
-	public fun <init> (Ljava/util/List;Lkotlin/jvm/functions/Function0;Lio/getstream/video/android/core/notifications/NotificationHandler;)V
-	public synthetic fun <init> (Ljava/util/List;Lkotlin/jvm/functions/Function0;Lio/getstream/video/android/core/notifications/NotificationHandler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/util/List;Lkotlin/jvm/functions/Function0;Lio/getstream/video/android/core/notifications/NotificationHandler;Z)V
+	public synthetic fun <init> (Ljava/util/List;Lkotlin/jvm/functions/Function0;Lio/getstream/video/android/core/notifications/NotificationHandler;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/util/List;
 	public final fun component2 ()Lkotlin/jvm/functions/Function0;
 	public final fun component3 ()Lio/getstream/video/android/core/notifications/NotificationHandler;
-	public final fun copy (Ljava/util/List;Lkotlin/jvm/functions/Function0;Lio/getstream/video/android/core/notifications/NotificationHandler;)Lio/getstream/video/android/core/notifications/NotificationConfig;
-	public static synthetic fun copy$default (Lio/getstream/video/android/core/notifications/NotificationConfig;Ljava/util/List;Lkotlin/jvm/functions/Function0;Lio/getstream/video/android/core/notifications/NotificationHandler;ILjava/lang/Object;)Lio/getstream/video/android/core/notifications/NotificationConfig;
+	public final fun component4 ()Z
+	public final fun copy (Ljava/util/List;Lkotlin/jvm/functions/Function0;Lio/getstream/video/android/core/notifications/NotificationHandler;Z)Lio/getstream/video/android/core/notifications/NotificationConfig;
+	public static synthetic fun copy$default (Lio/getstream/video/android/core/notifications/NotificationConfig;Ljava/util/List;Lkotlin/jvm/functions/Function0;Lio/getstream/video/android/core/notifications/NotificationHandler;ZILjava/lang/Object;)Lio/getstream/video/android/core/notifications/NotificationConfig;
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getHideRingingNotificationInForeground ()Z
 	public final fun getNotificationHandler ()Lio/getstream/video/android/core/notifications/NotificationHandler;
 	public final fun getPushDeviceGenerators ()Ljava/util/List;
 	public final fun getRequestPermissionOnAppLaunch ()Lkotlin/jvm/functions/Function0;

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/notifications/DefaultNotificationHandler.kt

@@ -17,6 +17,7 @@
 package io.getstream.video.android.core.notifications
 
 import android.annotation.SuppressLint
+import android.app.ActivityManager
 import android.app.Application
 import android.app.Notification
 import android.app.NotificationChannel
@@ -48,6 +49,13 @@ public open class DefaultNotificationHandler(
     private val notificationPermissionHandler: NotificationPermissionHandler =
         DefaultNotificationPermissionHandler
             .createDefaultNotificationPermissionHandler(application),
+    /**
+     * Set this to true if you want to make the ringing notifications as low-priority
+     * in case the application is in foreground. This will prevent the notification from
+     * interrupting the user while he is in the app. In this case you need to make sure to
+     * handle this call state and display an incoming call screen.
+     */
+    val hideRingingNotificationInForeground: Boolean = false,
 ) : NotificationHandler,
     NotificationPermissionHandler by notificationPermissionHandler {
 
@@ -126,13 +134,33 @@ public open class DefaultNotificationHandler(
         rejectCallPendingIntent: PendingIntent,
         callDisplayName: String,
     ): Notification {
+        // if the app is in foreground then don't interrupt the user with a high priority
+        // notification (popup). The application will display an incoming ringing call
+        // screen instead - but this needs to be handled by the application.
+        // The default behaviour is that all notification are high priority
+        val showAsHighPriority = !hideRingingNotificationInForeground || !isInForeground()
+
         val channelId = application.getString(
-            R.string.stream_video_incoming_call_notification_channel_id,
+            if (showAsHighPriority) {
+                R.string.stream_video_incoming_call_notification_channel_id
+            } else {
+                R.string.stream_video_incoming_call_low_priority_notification_channel_id
+            },
         )
         maybeCreateChannel(channelId, application) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                description = application.getString(R.string.stream_video_incoming_call_notification_channel_description)
-                importance = NotificationManager.IMPORTANCE_HIGH
+                description = application.getString(
+                    if (showAsHighPriority) {
+                        R.string.stream_video_incoming_call_notification_channel_description
+                    } else {
+                        R.string.stream_video_incoming_call_low_priority_notification_channel_description
+                    },
+                )
+                importance = if (showAsHighPriority) {
+                    NotificationManager.IMPORTANCE_HIGH
+                } else {
+                    NotificationManager.IMPORTANCE_LOW
+                }
                 this.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
                 this.setShowBadge(true)
             }
@@ -383,6 +411,15 @@ public open class DefaultNotificationHandler(
         }
     }
 
+    private fun isInForeground(): Boolean {
+        val appProcessInfo = ActivityManager.RunningAppProcessInfo()
+        ActivityManager.getMyMemoryState(appProcessInfo)
+        return (
+            appProcessInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND ||
+                appProcessInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE
+            )
+    }
+
     open fun getChannelId(): String = application.getString(
         R.string.stream_video_incoming_call_notification_channel_id,
     )

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/notifications/NotificationConfig.kt

@@ -23,4 +23,12 @@ public data class NotificationConfig(
     val pushDeviceGenerators: List<PushDeviceGenerator> = emptyList(),
     val requestPermissionOnAppLaunch: () -> Boolean = { true },
     val notificationHandler: NotificationHandler = NoOpNotificationHandler,
+    /**
+     * Set this to true if you want to make the ringing notifications as low-priority
+     * in case the application is in foreground. This will prevent the notification from
+     * interrupting the user while he is in the app. In this case you need to make sure to
+     * handle this call state and display an incoming call screen.
+     * NOTE: This setting has only an effect if you don't set a custom [NotificationHandler]!
+     */
+    val hideRingingNotificationInForeground: Boolean = false,
 )

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/notifications/internal/StreamNotificationManager.kt

@@ -80,6 +80,11 @@ internal class StreamNotificationManager private constructor(
                     deviceTokenStorage.updateUserDevice(pushDevice.toDevice())
                     Result.Success(newDevice)
                 } catch (e: Exception) {
+                    logger.e(e) {
+                        "Failed to register device for push notifications " +
+                            "(PN will not work!). Does the push provider key " +
+                            "(${pushDevice.pushProvider.key}) match the key in the Stream Dashboard?"
+                    }
                     Result.Failure(Error.ThrowableError("Device couldn't be created", e))
                 }
             }
@@ -151,7 +156,10 @@ internal class StreamNotificationManager private constructor(
                 } else {
                     val application = context.applicationContext as? Application
                     val updatedNotificationConfig =
-                        notificationConfig.overrideDefault(application)
+                        notificationConfig.overrideDefault(
+                            application = application,
+                            hideRingingNotificationInForeground = notificationConfig.hideRingingNotificationInForeground,
+                        )
                     val onPermissionStatus: (NotificationPermissionStatus) -> Unit = { nps ->
                         with(updatedNotificationConfig.notificationHandler) {
                             when (nps) {
@@ -182,11 +190,17 @@ internal class StreamNotificationManager private constructor(
             }
         }
 
-        private fun NotificationConfig.overrideDefault(application: Application?): NotificationConfig {
+        private fun NotificationConfig.overrideDefault(
+            application: Application?,
+            hideRingingNotificationInForeground: Boolean,
+        ): NotificationConfig {
             return application?.let {
                 val notificationHandler = notificationHandler
                     .takeUnless { it == NoOpNotificationHandler }
-                    ?: DefaultNotificationHandler(application)
+                    ?: DefaultNotificationHandler(
+                        application = application,
+                        hideRingingNotificationInForeground = hideRingingNotificationInForeground,
+                    )
                 this.copy(notificationHandler = notificationHandler)
             } ?: this
         }