Skip to content

Fix navigation stack overflow when sharing media #5724

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

Merged
merged 2 commits into from
Nov 14, 2025
+15 −3
Merged

Fix navigation stack overflow when sharing media #5724

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c146087
Fix navigation stack overflow when sharing media
jmartinesp Nov 13, 2025
53d100e
Improve the handling of back navigation in the navigation button too
jmartinesp Nov 13, 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
11 changes: 10 additions & 1 deletion ...elect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.items
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
Expand Down Expand Up @@ -81,15 +85,20 @@ fun RoomSelectView(
)
}

var canHandleBack by remember { mutableStateOf(true) }
fun onBackButton(state: RoomSelectState) {
if (state.isSearchActive) {
state.eventSink(RoomSelectEvents.ToggleSearchActive)
} else {
canHandleBack = false
Copy link
Member

@bmarty bmarty Nov 13, 2025

Choose a reason for hiding this comment

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

I think this is OK, but we do not check the value of canHandleBack before setting it and invoking onDismiss? Asking because navigationIcon click also invokes the fun onBackButton.

Copy link
Member Author

@jmartinesp jmartinesp Nov 13, 2025

Choose a reason for hiding this comment

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

Hmm, calling onBackButton from the back navigation icon could cause a different issue (2 or more back paginations if called quickly?), but it wouldn't interfere with the BackHandler here AFAICT.

onDismiss()
}
}

BackHandler(onBack = { onBackButton(state) })
BackHandler(
enabled = canHandleBack,
onBack = { onBackButton(state) }
)

Scaffold(
modifier = modifier,
Expand Down
Loading