Change default duration from SHORT to LONG

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

Author: ArnyminerZ

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

@@ -5,7 +5,6 @@ import android.content.Intent
 import android.net.Uri
 import android.provider.OpenableColumns
 import android.util.Log
-import android.widget.Toast
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -154,17 +153,13 @@ class AddSubscriptionModel @AssistedInject constructor(
             }
             toastAsync(
                 context,
-                messageResId = R.string.add_calendar_created,
-                cancelToast = null,
-                duration = Toast.LENGTH_LONG
+                messageResId = R.string.add_calendar_created
             )
         } catch (e: Exception) {
             Log.e(Constants.TAG, "Couldn't create calendar", e)
             toastAsync(
                 context,
-                message = { e.localizedMessage ?: e.message },
-                cancelToast = null,
-                duration = Toast.LENGTH_LONG
+                message = { e.localizedMessage ?: e.message }
             )
         } finally {
             uiState = uiState.copy(isCreating = false)

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

@@ -184,8 +184,7 @@ class SubscriptionsModel @Inject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             val toast = toastAsync(
                 context,
-                messageResId = R.string.backup_exporting,
-                duration = Toast.LENGTH_LONG
+                messageResId = R.string.backup_exporting
             )
 
             val subscriptions = subscriptions.value
@@ -206,14 +205,14 @@ class SubscriptionsModel @Inject constructor(
                 toastAsync(
                     context,
                     messageResId = R.string.backup_exported,
-                    cancelToast = toast
+                    cancelToast = toast,
+                    duration = Toast.LENGTH_SHORT
                 )
             } catch (e: IOException) {
                 Log.e(TAG, "Could not write export file.", e)
                 toastAsync(
                     context,
-                    messageResId = R.string.backup_export_error_io,
-                    duration = Toast.LENGTH_LONG
+                    messageResId = R.string.backup_export_error_io
                 )
             }
         }
@@ -223,8 +222,7 @@ class SubscriptionsModel @Inject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             val toast = toastAsync(
                 context,
-                messageResId = R.string.backup_importing,
-                duration = Toast.LENGTH_LONG
+                messageResId = R.string.backup_importing
             )
 
             try {
@@ -237,8 +235,7 @@ class SubscriptionsModel @Inject constructor(
                     toastAsync(
                         context,
                         messageResId = R.string.backup_import_error_io,
-                        cancelToast = toast,
-                        duration = Toast.LENGTH_LONG
+                        cancelToast = toast
                     )
                     return@launch
                 }
@@ -274,31 +271,29 @@ class SubscriptionsModel @Inject constructor(
                     message = {
                         resources.getQuantityString(R.plurals.backup_imported, newSubscriptions.size, newSubscriptions.size)
                     },
-                    cancelToast = toast
+                    cancelToast = toast,
+                    duration = Toast.LENGTH_SHORT
                 )
             } catch (e: JSONException) {
                 Log.e(TAG, "Could not load JSON: $e")
                 toastAsync(
                     context,
                     messageResId = R.string.backup_import_error_json,
-                    cancelToast = toast,
-                    duration = Toast.LENGTH_LONG
+                    cancelToast = toast
                 )
             } catch (e: SecurityException) {
                 Log.e(TAG, "Could not load JSON: $e")
                 toastAsync(
                     context,
                     messageResId = R.string.backup_import_error_security,
-                    cancelToast = toast,
-                    duration = Toast.LENGTH_LONG
+                    cancelToast = toast
                 )
             } catch (e: IOException) {
                 Log.e(TAG, "Could not load JSON: $e")
                 toastAsync(
                     context,
                     messageResId = R.string.backup_import_error_io,
-                    cancelToast = toast,
-                    duration = Toast.LENGTH_LONG
+                    cancelToast = toast
                 )
             }
         }

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

@@ -11,7 +11,7 @@ suspend fun toastAsync(
     message: Context.() -> String? = { null },
     @StringRes messageResId: Int? = null,
     cancelToast: Toast? = null,
-    duration: Int = Toast.LENGTH_SHORT
+    duration: Int = Toast.LENGTH_LONG
 ): Toast? = withContext(Dispatchers.Main) {
     cancelToast?.cancel()