ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 21:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep the app content composed when a native call starts

Browse Source 
The overlay now draws with no controller too, so starting a call no longer resets the content's state, such as the composer draft.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Valere
2026-09-29 15:08:55 +02:00
committed by Valere Fedronic
parent a2be854cf9
commit 01bc7dd070
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/callnative/impl/src/main/kotlin/io/element/android/features/callnative/impl/DefaultNativeCallHost.kt
+4 -7
View File
@@ -31,8 +31,8 @@ import timber.log.Timber
* session is already in scope and there is no need to go looking for one. The stack it draws is not, * session is already in scope and there is no need to go looking for one. The stack it draws is not,
* so this asks the app-scoped registry for its own session's controller. * so this asks the app-scoped registry for its own session's controller.
* *
* That controller only exists once a call has been placed or answered. Until then this is a * That controller only exists once a call has been placed or answered. Until then the overlay draws
* pass-through and nothing about the call is on screen. * the content alone.
*/ */
@ContributesBinding(SessionScope::class) @ContributesBinding(SessionScope::class)
class DefaultNativeCallHost( class DefaultNativeCallHost(
@@ -44,23 +44,20 @@ class DefaultNativeCallHost(
val controller by remember(client.sessionId) { controllers.controller(client.sessionId) } val controller by remember(client.sessionId) { controllers.controller(client.sessionId) }
.collectAsState(initial = null) .collectAsState(initial = null)
val current = controller val current = controller
if (current == null) {
content(modifier)
return
}
// Installed here rather than in the Activity because this is the only place that has both the // Installed here rather than in the Activity because this is the only place that has both the
// Activity and the session whose call it is. The Activity keeps `onUserLeaveHint`, which it // Activity and the session whose call it is. The Activity keeps `onUserLeaveHint`, which it
// cannot delegate: see NativeCallPip. // cannot delegate: see NativeCallPip.
val activity = LocalActivity.current as? ComponentActivity val activity = LocalActivity.current as? ComponentActivity
DisposableEffect(activity, current) { DisposableEffect(activity, current) {
if (activity != null) { if (activity != null && current != null) {
runCatchingExceptions { ElementCallPictureInPicture.attach(activity, current) } runCatchingExceptions { ElementCallPictureInPicture.attach(activity, current) }
.onFailure { Timber.w(it, "NativeCall: cannot attach picture-in-picture") } .onFailure { Timber.w(it, "NativeCall: cannot attach picture-in-picture") }
} }
onDispose { } onDispose { }
} }
// Composed even with no controller yet, so the content never moves in the tree and keeps its state.
ElementCallOverlay( ElementCallOverlay(
controller = current, controller = current,
modifier = modifier, modifier = modifier,