mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-07-22 11:11:02 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

DeleteCollectionDialog: handle case that result may contain null value (#697)

Browse source
This commit is contained in:
Ricki Hirner 2024-04-01 21:10:53 +02:00 committed by GitHub
parent 6d462ea9e4
commit 6b88052e10
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/src/main/kotlin/at/bitfire/davdroid/ui/account/DeleteCollectionDialog.kt
View file

@ -33,7 +33,7 @@ import at.bitfire.davdroid.R
import at.bitfire.davdroid.db.Collection
import at.bitfire.davdroid.ui.widget.ExceptionInfoDialog
import okhttp3.HttpUrl.Companion.toHttpUrl
import java.util.Optional
import kotlin.jvm.optionals.getOrNull
@Composable
fun DeleteCollectionDialog(
@ -58,17 +58,18 @@ fun DeleteCollectionDialog(
}
Dialog(
properties = DialogProperties(dismissOnClickOutside =
result != null || // finished with error message
!started // not started
),
properties = DialogProperties(
dismissOnClickOutside =
result != null || // finished with error message
!started // not started
),
onDismissRequest = ::dismiss
) {
Card {
DeleteCollectionDialog_Content(
collection = collection,
started = started,
result = result,
result = result?.getOrNull(),
onDeleteCollection = {
started = true
model.deleteCollection(collection)
@ -83,7 +84,7 @@ fun DeleteCollectionDialog(
fun DeleteCollectionDialog_Content(
collection: Collection,
started: Boolean,
result: Optional<Exception>?,
result: Exception?,
onDeleteCollection: () -> Unit = {},
onCancel: () -> Unit = {}
) {
@ -100,14 +101,11 @@ fun DeleteCollectionDialog_Content(
)
when {
result != null -> {
val exception = result.get()
ExceptionInfoDialog(
exception = exception,
remoteResource = collection.url,
onDismiss = onCancel
)
}
result != null -> ExceptionInfoDialog(
exception = result,
remoteResource = collection.url,
onDismiss = onCancel
)
started -> {
LinearProgressIndicator(
@ -202,6 +200,6 @@ fun DeleteCollectionDialog_Preview_Error() {
url = "https://example.com/calendar".toHttpUrl(),
),
started = true,
result = Optional.of(Exception("Test error"))
result = Exception("Test error")
)
}