From d22e918273056b06bf27feffd80efdb1ea1b3344 Mon Sep 17 00:00:00 2001 From: Kelvin Date: Thu, 26 Jun 2025 16:17:17 +0200 Subject: [PATCH] Missing catches --- .../dialogs/ImportOptionsDialog.kt | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/dialogs/ImportOptionsDialog.kt b/app/src/main/java/com/futo/platformplayer/dialogs/ImportOptionsDialog.kt index a71ee36e..4c0ccb7a 100644 --- a/app/src/main/java/com/futo/platformplayer/dialogs/ImportOptionsDialog.kt +++ b/app/src/main/java/com/futo/platformplayer/dialogs/ImportOptionsDialog.kt @@ -6,6 +6,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.widget.Button import com.futo.platformplayer.R +import com.futo.platformplayer.UIDialogs import com.futo.platformplayer.activities.MainActivity import com.futo.platformplayer.fragment.mainactivity.main.SourcesFragment import com.futo.platformplayer.readBytes @@ -47,7 +48,12 @@ class ImportOptionsDialog: AlertDialog { StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) { val zipBytes = it?.readBytes(context) ?: return@launch; withContext(Dispatchers.Main) { - StateBackup.importZipBytes(_context, StateApp.instance.scope, zipBytes); + try { + StateBackup.importZipBytes(_context, StateApp.instance.scope, zipBytes); + } + catch(ex: Throwable) { + UIDialogs.toast("Failed to import, invalid format?\n" + ex.message); + } } } }; @@ -62,7 +68,12 @@ class ImportOptionsDialog: AlertDialog { val txtBytes = it?.readBytes(context) ?: return@launch; val txt = String(txtBytes); withContext(Dispatchers.Main) { - StateBackup.importTxt(_context, txt); + try { + StateBackup.importTxt(_context, txt); + } + catch(ex: Throwable) { + UIDialogs.toast("Failed to import, invalid format?\n" + ex.message); + } } } }; @@ -74,7 +85,12 @@ class ImportOptionsDialog: AlertDialog { val jsonBytes = it?.readBytes(context) ?: return@launch; val json = String(jsonBytes); withContext(Dispatchers.Main) { - StateBackup.importNewPipeSubs(_context, json); + try { + StateBackup.importNewPipeSubs(_context, json); + } + catch(ex: Throwable) { + UIDialogs.toast("Failed to import, invalid format?\n" + ex.message); + } } } };