Simplify toastAsync

Signed-off-by: Arnau Mora <arnyminerz@proton.me>

Author: ArnyminerZ

app/src/main/java/at/bitfire/icsdroid/model/AddSubscriptionModel.kt

@@ -151,16 +151,10 @@ class AddSubscriptionModel @AssistedInject constructor(
                 // sync the subscription to reflect the changes in the calendar provider
                 SyncWorker.run(context)
             }
-            toastAsync(
-                context,
-                messageResId = R.string.add_calendar_created
-            )
+            toastAsync(context) { context.getString(R.string.add_calendar_created) }
         } catch (e: Exception) {
             Log.e(Constants.TAG, "Couldn't create calendar", e)
-            toastAsync(
-                context,
-                message = { e.localizedMessage ?: e.message }
-            )
+            toastAsync(context) { e.localizedMessage ?: e.message }
         } finally {
             uiState = uiState.copy(isCreating = false)
         }

app/src/main/java/at/bitfire/icsdroid/model/SubscriptionsModel.kt

@@ -182,10 +182,7 @@ class SubscriptionsModel @Inject constructor(
 
     fun onBackupExportRequested(uri: Uri) {
         viewModelScope.launch(Dispatchers.IO) {
-            val toast = toastAsync(
-                context,
-                messageResId = R.string.backup_exporting
-            )
+            val toast = toastAsync(context) { context.getString(R.string.backup_exporting) }
 
             val subscriptions = subscriptions.value
             Log.i(TAG, "Exporting ${subscriptions.size} subscriptions...")
@@ -204,26 +201,19 @@ class SubscriptionsModel @Inject constructor(
 
                 toastAsync(
                     context,
-                    messageResId = R.string.backup_exported,
                     cancelToast = toast,
                     duration = Toast.LENGTH_SHORT
-                )
+                ) { context.getString(R.string.backup_exported) }
             } catch (e: IOException) {
                 Log.e(TAG, "Could not write export file.", e)
-                toastAsync(
-                    context,
-                    messageResId = R.string.backup_export_error_io
-                )
+                toastAsync(context) { context.getString(R.string.backup_export_error_io) }
             }
         }
     }
 
     fun onBackupImportRequested(uri: Uri) {
         viewModelScope.launch(Dispatchers.IO) {
-            val toast = toastAsync(
-                context,
-                messageResId = R.string.backup_importing
-            )
+            val toast = toastAsync(context) { context.getString(R.string.backup_importing) }
 
             try {
                 val jsonString = context.contentResolver.openFileDescriptor(uri, "r")?.use { fd ->
@@ -234,9 +224,8 @@ class SubscriptionsModel @Inject constructor(
                 if (jsonString == null) {
                     toastAsync(
                         context,
-                        messageResId = R.string.backup_import_error_io,
                         cancelToast = toast
-                    )
+                    ) { context.getString(R.string.backup_import_error_io) }
                     return@launch
                 }
 
@@ -278,23 +267,20 @@ class SubscriptionsModel @Inject constructor(
                 Log.e(TAG, "Could not load JSON: $e")
                 toastAsync(
                     context,
-                    messageResId = R.string.backup_import_error_json,
                     cancelToast = toast
-                )
+                ) { context.getString(R.string.backup_import_error_json) }
             } catch (e: SecurityException) {
                 Log.e(TAG, "Could not load JSON: $e")
                 toastAsync(
                     context,
-                    messageResId = R.string.backup_import_error_security,
                     cancelToast = toast
-                )
+                ) { context.getString(R.string.backup_import_error_security) }
             } catch (e: IOException) {
                 Log.e(TAG, "Could not load JSON: $e")
                 toastAsync(
                     context,
-                    messageResId = R.string.backup_import_error_io,
                     cancelToast = toast
-                )
+                ) { context.getString(R.string.backup_import_error_io) }
             }
         }
     }

app/src/main/java/at/bitfire/icsdroid/model/ViewModelUtils.kt

@@ -2,23 +2,17 @@ package at.bitfire.icsdroid.model
 
 import android.content.Context
 import android.widget.Toast
-import androidx.annotation.StringRes
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
 suspend fun toastAsync(
     context: Context,
-    message: Context.() -> String? = { null },
-    @StringRes messageResId: Int? = null,
     cancelToast: Toast? = null,
-    duration: Int = Toast.LENGTH_LONG
+    duration: Int = Toast.LENGTH_LONG,
+    message: Context.() -> String?
 ): Toast? = withContext(Dispatchers.Main) {
     cancelToast?.cancel()
 
     val msg = message(context)
-    when {
-        msg != null -> Toast.makeText(context, msg, duration)
-        messageResId != null -> Toast.makeText(context, messageResId, duration)
-        else -> return@withContext null
-    }.also { it.show() }
+    Toast.makeText(context, msg, duration).also { it.show() }
 }