Skip to content

Commit 7640dde

Browse files
authored
Fix potential race and crash when deleting a call link.
1 parent 246abb9 commit 7640dde

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ class CallLinkDetailsActivity : FragmentActivity() {
6565
}.show(supportFragmentManager, null)
6666
}
6767

68+
is MainNavigationDetailLocation.Empty -> {
69+
finishAfterTransition()
70+
}
71+
6872
else -> error("Unsupported route $location")
6973
}
7074
}

app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import org.thoughtcrime.securesms.calls.links.CallLinks
4646
import org.thoughtcrime.securesms.calls.links.SignalCallRow
4747
import org.thoughtcrime.securesms.database.CallLinkTable
4848
import org.thoughtcrime.securesms.main.MainNavigationDetailLocation
49-
import org.thoughtcrime.securesms.main.MainNavigationListLocation
5049
import org.thoughtcrime.securesms.main.MainNavigationRouter
5150
import org.thoughtcrime.securesms.main.MainNavigationViewModel
5251
import org.thoughtcrime.securesms.recipients.RecipientId
@@ -154,7 +153,6 @@ class DefaultCallLinkDetailsCallback(
154153
viewModel.setDisplayRevocationDialog(false)
155154
activity.lifecycleScope.launch {
156155
if (viewModel.delete()) {
157-
router.goTo(MainNavigationListLocation.CALLS)
158156
router.goTo(MainNavigationDetailLocation.Empty)
159157
}
160158
}

0 commit comments

Comments
 (0)