From 27f42de963aa8b14a78ea2756ad9b236ddd02288 Mon Sep 17 00:00:00 2001
From: Ahmad Ansori Palembani <palembani@gmail.com>
Date: Mon, 10 Jun 2024 19:32:53 +0700
Subject: [PATCH] fix(SettingsDataScreen): Dismiss the alert dialog

---
 .../settings/screen/SettingsDataScreen.kt     |  9 +++++++-
 .../settings/screen/data/AlertDialogs.kt      | 23 +++++++++++++------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/dev/yokai/presentation/settings/screen/SettingsDataScreen.kt b/app/src/main/java/dev/yokai/presentation/settings/screen/SettingsDataScreen.kt
index 26092998d2..60c0ba3ca2 100644
--- a/app/src/main/java/dev/yokai/presentation/settings/screen/SettingsDataScreen.kt
+++ b/app/src/main/java/dev/yokai/presentation/settings/screen/SettingsDataScreen.kt
@@ -140,7 +140,14 @@ object SettingsDataScreen : ComposableSettings {
             }
 
             alertDialog.content = {
-                RestoreBackup(context = context, uri = it, pair = results)
+                RestoreBackup(
+                    context = context,
+                    uri = it,
+                    pair = results,
+                    onDismissRequest = {
+                        alertDialog.content = null
+                    }
+                )
             }
         }
 
diff --git a/app/src/main/java/dev/yokai/presentation/settings/screen/data/AlertDialogs.kt b/app/src/main/java/dev/yokai/presentation/settings/screen/data/AlertDialogs.kt
index 0b08dfcbcc..d263187d1f 100644
--- a/app/src/main/java/dev/yokai/presentation/settings/screen/data/AlertDialogs.kt
+++ b/app/src/main/java/dev/yokai/presentation/settings/screen/data/AlertDialogs.kt
@@ -13,7 +13,12 @@ import eu.kanade.tachiyomi.data.backup.restore.BackupRestoreJob
 import eu.kanade.tachiyomi.util.system.toast
 
 @Composable
-fun RestoreBackup(context: Context, uri: Uri, pair: Pair<Results?, Exception?>) {
+fun RestoreBackup(
+    context: Context,
+    uri: Uri,
+    pair: Pair<Results?, Exception?>,
+    onDismissRequest: () -> Unit,
+) {
     val (results, e) = pair
     if (results != null) {
         var message = stringResource(R.string.restore_content_full)
@@ -33,19 +38,20 @@ fun RestoreBackup(context: Context, uri: Uri, pair: Pair<Results?, Exception?>)
         }
 
         AlertDialog(
-            onDismissRequest = {},
+            onDismissRequest = onDismissRequest,
             confirmButton = {
                 TextButton(
                     onClick = {
                         context.toast(R.string.restoring_backup)
                         BackupRestoreJob.start(context, uri)
+                        onDismissRequest()
                     },
                 ) {
                     Text(text = stringResource(R.string.restore))
                 }
             },
             dismissButton = {
-                TextButton(onClick = {}) {
+                TextButton(onClick = onDismissRequest) {
                     Text(text = stringResource(android.R.string.cancel))
                 }
             },
@@ -54,9 +60,9 @@ fun RestoreBackup(context: Context, uri: Uri, pair: Pair<Results?, Exception?>)
         )
     } else {
         AlertDialog(
-            onDismissRequest = {},
+            onDismissRequest = onDismissRequest,
             confirmButton = {
-                TextButton(onClick = {}) {
+                TextButton(onClick = onDismissRequest) {
                     Text(text = stringResource(android.R.string.cancel))
                 }
             },
@@ -67,9 +73,12 @@ fun RestoreBackup(context: Context, uri: Uri, pair: Pair<Results?, Exception?>)
 }
 
 @Composable
-private fun CreateBackup(context: Context) {
+private fun CreateBackup(
+    context: Context,
+    onDismissRequest: () -> Unit,
+) {
     AlertDialog(
-        onDismissRequest = {},
+        onDismissRequest = onDismissRequest,
         confirmButton = {},
     )
 }