justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-08 15:50:16 +02:00
Code Issues Projects Packages Wiki Activity Actions

Fix crash when starting app from next up (#730)

Browse source 
## Description
Fixes a possible crash starting the app from the next up row

### Related issues
Fixes #729
This commit is contained in:
Ray 2026-01-20 13:49:46 -05:00 • committed by GitHub
parent 7a20fedef4
commit 81d7aad0c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt
View file

@ -150,7 +150,6 @@ class MainActivity : AppCompatActivity() {
}
}
viewModel.appStart()
val requestedDestination = this.intent?.let(::extractDestination)
setContent {
val appPreferences by userPreferencesDataStore.data.collectAsState(null)
appPreferences?.let { appPreferences ->
@ -257,6 +256,10 @@ class MainActivity : AppCompatActivity() {
}
if (showContent) {
val requestedDestination =
remember(intent) {
intent?.let(::extractDestination)
}
ApplicationContent(
user = current.user,
server = current.server,
@ -344,6 +347,7 @@ class MainActivity : AppCompatActivity() {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
Timber.v("onNewIntent")
setIntent(intent)
extractDestination(intent)?.let {
navigationManager.replace(it)
}

6
app/src/main/java/com/github/damontecres/wholphin/services/NavigationManager.kt
View file

@ -75,7 +75,11 @@ class NavigationManager
while (backStack.size > 1) {
backStack.removeLastOrNull()
}
backStack[0] = destination
if (backStack.isEmpty()) {
backStack.add(0, destination)
} else {
backStack[0] = destination
}
log()
}