Skip to content

Commit 9370bf1

Browse files
aleksandar-apostolovaleksandar-apostolov
committed
Merge branch 'develop'
2 parents 55fc028 + 7454393 commit 9370bf1

File tree

19 files changed

+251
-122
lines changed

19 files changed

+251
-122
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ object Configuration {
66
const val minSdk = 24
77
const val majorVersion = 0
88
const val minorVersion = 5
9-
const val patchVersion = 5
9+
const val patchVersion = 6
1010
const val versionName = "$majorVersion.$minorVersion.$patchVersion"
11-
const val versionCode = 19
11+
const val versionCode = 20
1212
const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
1313
const val artifactGroup = "io.getstream"
14-
const val streamVideoCallGooglePlayVersion = "1.0.7"
14+
const val streamVideoCallGooglePlayVersion = "1.0.8"
1515
const val streamWebRtcVersionName = "1.1.1"
1616
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ If you're new to android, note that there are 2 `build.gradle` files, you want t
3131
```kotlin
3232
dependencies {
3333
// Stream Video Compose SDK
34-
implementation("io.getstream:stream-video-android-ui-compose:0.5.5")
34+
implementation("io.getstream:stream-video-android-ui-compose:0.5.6")
3535

3636
// Optionally add Jetpack Compose if Android studio didn't automatically include them
3737
implementation(platform("androidx.compose:compose-bom:2023.08.00"))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ If you're new to android, note that there are 2 `build.gradle` files, you want t
3535
```groovy
3636
dependencies {
3737
// Stream Video Compose SDK
38-
implementation("io.getstream:stream-video-android-ui-compose:0.5.5")
38+
implementation("io.getstream:stream-video-android-ui-compose:0.5.6")
3939
4040
// Jetpack Compose (optional/ android studio typically adds them when you create a new project)
4141
implementation(platform("androidx.compose:compose-bom:2023.08.00"))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ If you're new to android, note that there are 2 `build.gradle` files, you want t
3535
```kotlin
3636
dependencies {
3737
// Stream Video Compose SDK
38-
implementation("io.getstream:stream-video-android-ui-compose:0.5.5")
38+
implementation("io.getstream:stream-video-android-ui-compose:0.5.6")
3939

4040
// Jetpack Compose (optional/ android studio typically adds them when you create a new project)
4141
implementation(platform("androidx.compose:compose-bom:2023.08.00"))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Let the project sync. It should have all the dependencies required for you to fi
3131
```groovy
3232
dependencies {
3333
// Stream Video Compose SDK
34-
implementation("io.getstream:stream-video-android-ui-compose:0.5.5")
34+
implementation("io.getstream:stream-video-android-ui-compose:0.5.6")
3535
3636
// Stream Chat
3737
implementation(libs.stream.chat.compose)

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4116,7 +4116,6 @@ public final class io/getstream/video/android/core/notifications/NotificationCon
41164116

41174117
public abstract interface class io/getstream/video/android/core/notifications/NotificationHandler : io/getstream/android/push/permissions/NotificationPermissionHandler {
41184118
public static final field ACTION_ACCEPT_CALL Ljava/lang/String;
4119-
public static final field ACTION_DISMISS_NOTIFICATION Ljava/lang/String;
41204119
public static final field ACTION_INCOMING_CALL Ljava/lang/String;
41214120
public static final field ACTION_LEAVE_CALL Ljava/lang/String;
41224121
public static final field ACTION_LIVE_CALL Ljava/lang/String;
@@ -4128,8 +4127,6 @@ public abstract interface class io/getstream/video/android/core/notifications/No
41284127
public static final field INCOMING_CALL_NOTIFICATION_ID I
41294128
public static final field INTENT_EXTRA_CALL_CID Ljava/lang/String;
41304129
public static final field INTENT_EXTRA_CALL_DISPLAY_NAME Ljava/lang/String;
4131-
public static final field INTENT_EXTRA_NEXT_ACTION Ljava/lang/String;
4132-
public static final field INTENT_EXTRA_NEXT_ACTION_BUNDLE Ljava/lang/String;
41334130
public static final field INTENT_EXTRA_NOTIFICATION_ID Ljava/lang/String;
41344131
public abstract fun getOngoingCallNotification (Lio/getstream/video/android/model/StreamCallId;)Landroid/app/Notification;
41354132
public abstract fun getRingingCallNotification (Lio/getstream/video/android/core/RingingState;Lio/getstream/video/android/model/StreamCallId;Ljava/lang/String;)Landroid/app/Notification;
@@ -4140,7 +4137,6 @@ public abstract interface class io/getstream/video/android/core/notifications/No
41404137

41414138
public final class io/getstream/video/android/core/notifications/NotificationHandler$Companion {
41424139
public static final field ACTION_ACCEPT_CALL Ljava/lang/String;
4143-
public static final field ACTION_DISMISS_NOTIFICATION Ljava/lang/String;
41444140
public static final field ACTION_INCOMING_CALL Ljava/lang/String;
41454141
public static final field ACTION_LEAVE_CALL Ljava/lang/String;
41464142
public static final field ACTION_LIVE_CALL Ljava/lang/String;
@@ -4151,8 +4147,6 @@ public final class io/getstream/video/android/core/notifications/NotificationHan
41514147
public static final field INCOMING_CALL_NOTIFICATION_ID I
41524148
public static final field INTENT_EXTRA_CALL_CID Ljava/lang/String;
41534149
public static final field INTENT_EXTRA_CALL_DISPLAY_NAME Ljava/lang/String;
4154-
public static final field INTENT_EXTRA_NEXT_ACTION Ljava/lang/String;
4155-
public static final field INTENT_EXTRA_NEXT_ACTION_BUNDLE Ljava/lang/String;
41564150
public static final field INTENT_EXTRA_NOTIFICATION_ID Ljava/lang/String;
41574151
}
41584152

‎stream-video-android-core/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,6 @@
7676
</intent-filter>
7777
</receiver>
7878

79-
<receiver android:name=".notifications.internal.receivers.DismissNotificationBroadcastReceiver"
80-
android:exported="false">
81-
<intent-filter android:priority="-1">
82-
<action android:name="io.getstream.video.android.action.DISMISS_NOTIFICATION" />
83-
</intent-filter>
84-
</receiver>
85-
8679

8780
<service android:name=".notifications.internal.service.CallService"
8881
android:foregroundServiceType="shortService|microphone"/>

‎stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/Call.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,6 +1015,8 @@ public class Call(
10151015
}
10161016

10171017
suspend fun accept(): Result<AcceptCallResponse> {
1018+
clientImpl.state.removeRingingCall()
1019+
clientImpl.state.maybeStopForegroundService()
10181020
return clientImpl.accept(type, id)
10191021
}
10201022

‎stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/ClientState.kt‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,11 @@ class ClientState(client: StreamVideo) {
127127
_ringingCall.value = null
128128
}
129129

130-
// Internal logic
131-
private fun maybeStartForegroundService(call: Call, trigger: String) {
130+
/**
131+
* Start a foreground service that manages the call even when the UI is gone.
132+
* This depends on the flag in [StreamVideoBuilder] called `runForegroundServiceForCalls`
133+
*/
134+
internal fun maybeStartForegroundService(call: Call, trigger: String) {
132135
if (clientImpl.runForegroundService) {
133136
val context = clientImpl.context
134137
val serviceIntent = CallService.buildStartIntent(
@@ -140,7 +143,10 @@ class ClientState(client: StreamVideo) {
140143
}
141144
}
142145

143-
private fun maybeStopForegroundService() {
146+
/**
147+
* Stop the foreground service that manages the call even when the UI is gone.
148+
*/
149+
internal fun maybeStopForegroundService() {
144150
if (clientImpl.runForegroundService) {
145151
val context = clientImpl.context
146152
val serviceIntent = CallService.buildStopIntent(context)

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public interface NotificationHandler : NotificationPermissionHandler {
3838
const val ACTION_INCOMING_CALL = "io.getstream.video.android.action.INCOMING_CALL"
3939
const val ACTION_OUTGOING_CALL = "io.getstream.video.android.action.OUTGOING_CALL"
4040
const val ACTION_ACCEPT_CALL = "io.getstream.video.android.action.ACCEPT_CALL"
41-
const val ACTION_DISMISS_NOTIFICATION = "io.getstream.video.android.action.DISMISS_NOTIFICATION"
4241
const val ACTION_REJECT_CALL = "io.getstream.video.android.action.REJECT_CALL"
4342
const val ACTION_LEAVE_CALL = "io.getstream.video.android.action.LEAVE_CALL"
4443
const val ACTION_ONGOING_CALL = "io.getstream.video.android.action.ONGOING_CALL"
@@ -47,10 +46,6 @@ public interface NotificationHandler : NotificationPermissionHandler {
4746

4847
const val INTENT_EXTRA_NOTIFICATION_ID: String =
4948
"io.getstream.video.android.intent-extra.notification_id"
50-
const val INTENT_EXTRA_NEXT_ACTION: String =
51-
"io.getstream.video.android.intent-extra.next_action"
52-
const val INTENT_EXTRA_NEXT_ACTION_BUNDLE: String =
53-
"io.getstream.video.android.intent-extra.next_action_data"
5449
const val INCOMING_CALL_NOTIFICATION_ID = 24756
5550
}
5651
}

0 commit comments

Comments
 (0)