Skip to content

Commit ba11dec

Browse files
authored
[AND-26] Fix sound still audible when device muted issue (#1229)
* Remove audioUsage CallServiceConfig and rely on Builder parameter. * Use correct log tags for livestream fg services * Adapt unit tests * Revert "Remove audioUsage CallServiceConfig and rely on Builder parameter." This reverts commit 51a7ba9. * Revert "Adapt unit tests" This reverts commit 53c0727. * Remove audioUsage Builder param and rely on callServiceConfig * Fix message
1 parent 349b2a1 commit ba11dec

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public class Call(
209209
this,
210210
scope,
211211
clientImpl.peerConnectionFactory.eglBase.eglBaseContext,
212-
clientImpl.audioUsage,
212+
clientImpl.callServiceConfig.audioUsage,
213213
)
214214
}
215215
}

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@ public class StreamVideoBuilder @JvmOverloads constructor(
113113
private val sounds: Sounds = defaultResourcesRingingConfig(context).toSounds(),
114114
private val crashOnMissingPermission: Boolean = false,
115115
private val permissionCheck: StreamPermissionCheck = DefaultStreamPermissionCheck(),
116+
@Deprecated(
117+
message = "This property is ignored. Set audioUsage in the callServiceConfig parameter.",
118+
level = DeprecationLevel.WARNING,
119+
)
116120
private val audioUsage: Int = defaultAudioUsage,
117121
private val appName: String? = null,
118122
private val audioProcessing: ManagedAudioProcessingFactory? = null,
@@ -208,13 +212,12 @@ public class StreamVideoBuilder @JvmOverloads constructor(
208212
callServiceConfig = callServiceConfig
209213
?: callServiceConfig().copy(
210214
runCallServiceInForeground = runForegroundServiceForCalls,
211-
audioUsage = audioUsage,
215+
audioUsage = defaultAudioUsage,
212216
),
213217
testSfuAddress = localSfuAddress,
214218
sounds = sounds,
215219
permissionCheck = permissionCheck,
216220
crashOnMissingPermission = crashOnMissingPermission,
217-
audioUsage = audioUsage,
218221
appName = appName,
219222
audioProcessing = audioProcessing,
220223
leaveAfterDisconnectSeconds = leaveAfterDisconnectSeconds,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ internal class StreamVideoClient internal constructor(
152152
internal val sounds: Sounds,
153153
internal val permissionCheck: StreamPermissionCheck = DefaultStreamPermissionCheck(),
154154
internal val crashOnMissingPermission: Boolean = false,
155-
internal val audioUsage: Int = defaultAudioUsage,
156155
internal val appName: String? = null,
157156
internal val audioProcessing: ManagedAudioProcessingFactory? = null,
158157
internal val leaveAfterDisconnectSeconds: Long = 30,
@@ -175,7 +174,7 @@ internal class StreamVideoClient internal constructor(
175174

176175
@InternalStreamVideoApi
177176
public var peerConnectionFactory =
178-
StreamPeerConnectionFactory(context, audioUsage, audioProcessing)
177+
StreamPeerConnectionFactory(context, callServiceConfig.audioUsage, audioProcessing)
179178

180179
public override val userId = user.id
181180

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ internal open class LivestreamCallService : CallService() {
3232
* Due to the nature of the livestream calls, the service that is used is of different type.
3333
*/
3434
internal open class LivestreamAudioCallService : CallService() {
35-
override val logger: TaggedLogger by taggedLogger("LivestreamHostCallService")
35+
override val logger: TaggedLogger by taggedLogger("LivestreamAudioCallService")
3636
override val serviceType = ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE
3737
}
3838

3939
/**
4040
* Due to the nature of the livestream calls, the service that is used is of different type.
4141
*/
4242
internal class LivestreamViewerService : LivestreamCallService() {
43-
override val logger: TaggedLogger by taggedLogger("LivestreamHostCallService")
43+
override val logger: TaggedLogger by taggedLogger("LivestreamViewerService")
4444
override val serviceType = ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK
4545
}

0 commit comments

Comments
 (0)