Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use in-call volume and mode for EC #4481

Merged
merged 5 commits into from
Apr 11, 2025
+68 −0
Merged

Use in-call volume and mode for EC #4481

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b570a0b
Use in-call volume and mode for EC
jmartinesp Mar 26, 2025
e5ec2c4
Try routing audio to external device
jmartinesp Mar 27, 2025
d2dbae8
Fix lint issues
jmartinesp Mar 27, 2025
4645d6f
Merge branch 'develop' into fix/use-in-call-volume-for-element-call-a…
jmartinesp Apr 9, 2025
c19acb7
Place speaker before earpiece in list of audio devices
jmartinesp Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...ures/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package io.element.android.features.call.impl.ui

import android.annotation.SuppressLint
import android.media.AudioManager
import android.util.Log
import android.view.ViewGroup
import android.webkit.ConsoleMessage
Expand All @@ -27,6 +28,7 @@ import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.viewinterop.AndroidView
import androidx.core.content.getSystemService
import io.element.android.compound.tokens.generated.CompoundIcons
import io.element.android.features.call.impl.R
import io.element.android.features.call.impl.pip.PictureInPictureEvents
Expand Down Expand Up @@ -150,6 +152,10 @@ private fun CallWebView(
AndroidView(
modifier = modifier,
factory = { context ->
// Set 'voice call' mode so volume keys actually control the call volume
val audioManager = context.getSystemService<AudioManager>()
audioManager?.mode = AudioManager.MODE_IN_COMMUNICATION

WebView(context).apply {
onWebViewCreate(this)
setup(userAgent, onPermissionsRequest)
Expand All @@ -161,6 +167,10 @@ private fun CallWebView(
}
},
onRelease = { webView ->
// Reset audio mode
val audioManager = webView.context.getSystemService<AudioManager>()
audioManager?.mode = AudioManager.MODE_NORMAL
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe store the previous mode and restore it here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From what I saw in some issues (this is poorly documented, AFAICT) the app can be 'blacklisted' if it doesn't play any audio in the 6s after enabling this mode or doesn't return to the MODE_NORMAL when it's done playing.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, thanks.


webView.destroy()
}
)
Expand Down
Loading