Skip to content

Open the host that was tapped, not the one the tab showed last #83

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
ehoeve786 merged 1 commit into from
Nov 1, 2026
Merged

Open the host that was tapped, not the one the tab showed last #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion app/src/main/java/com/secrm/ui/HostPager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.snapshotFlow
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.pointer.PointerEventPass
import androidx.compose.ui.input.pointer.pointerInput
Expand All @@ -30,6 +31,7 @@ import androidx.compose.ui.platform.LocalViewConfiguration
import androidx.compose.ui.unit.dp
import com.secrm.HostSession
import com.secrm.SecureRemoteApp
import kotlinx.coroutines.flow.drop
import kotlinx.coroutines.launch
import kotlin.math.abs

Expand All @@ -45,7 +47,12 @@ fun HostPager(app: SecureRemoteApp, hosts: List<HostSession>, content: @Composab
val pager = rememberPagerState(initialPage = index) { hosts.size }
val scope = rememberCoroutineScope()
LaunchedEffect(index) { if (pager.currentPage != index) pager.animateScrollToPage(index) }
LaunchedEffect(pager.settledPage) { hosts.getOrNull(pager.settledPage)?.let { app.sessions.select(it.name) } }
// The first page is skipped: it is the page the tab showed last time (restored with the tab), or the page it was on
// when the host list changed, not a swipe. Selecting it would replace the host just tapped on the Hosts screen with
// whichever one the tab showed before.
LaunchedEffect(pager, hosts) {
snapshotFlow { pager.settledPage }.drop(1).collect { page -> hosts.getOrNull(page)?.let { app.sessions.select(it.name) } }
}

Column(Modifier.fillMaxSize()) {
HorizontalPager(
Expand Down
Loading