Fixed going back being called twice

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

Author: ArnyminerZ

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

@@ -6,9 +6,8 @@ package at.bitfire.icsdroid.model
 
 import android.content.Context
 import android.util.Log
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
+import android.widget.Toast
+import androidx.annotation.StringRes
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import at.bitfire.icsdroid.Constants
@@ -26,6 +25,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @HiltViewModel(assistedFactory = EditSubscriptionModel.EditSubscriptionModelFactory::class)
 class EditSubscriptionModel @AssistedInject constructor(
@@ -79,9 +79,6 @@ class EditSubscriptionModel @AssistedInject constructor(
             credentialsDirty || subscriptionsDirty
         }
 
-    var successMessage: String? by mutableStateOf(null)
-        private set
-
     val subscription = db.subscriptionsDao().getByIdFlow(subscriptionId)
     val subscriptionWithCredential = db.subscriptionsDao().getWithCredentialsByIdFlow(subscriptionId)
 
@@ -126,6 +123,10 @@ class EditSubscriptionModel @AssistedInject constructor(
             initialRequiresAuthValue = uiState.requiresAuth
         }
 
+    private suspend fun showMessage(@StringRes message: Int) = withContext(Dispatchers.Main) {
+        Toast.makeText(context, message, Toast.LENGTH_LONG).show()
+    }
+
     /**
      * Updates the loaded subscription from the data provided by the view models.
      */
@@ -150,7 +151,7 @@ class EditSubscriptionModel @AssistedInject constructor(
                     db.credentialsDao().removeBySubscriptionId(subscriptionId)
 
                 // notify UI about success
-                successMessage = context.getString(R.string.edit_calendar_saved)
+                showMessage(R.string.edit_calendar_saved)
 
                 // sync the subscription to reflect the changes in the calendar provider
                 SyncWorker.run(context, forceResync = true)
@@ -170,7 +171,7 @@ class EditSubscriptionModel @AssistedInject constructor(
                 SyncWorker.run(context)
 
                 // notify UI about success
-                successMessage = context.getString(R.string.edit_calendar_deleted)
+                showMessage(R.string.edit_calendar_deleted)
             } ?: Log.w(Constants.TAG, "There's no subscription to remove")
         }
     }

app/src/main/java/at/bitfire/icsdroid/ui/nav/MainApp.kt

@@ -82,6 +82,7 @@ fun MainApp(
     val backStack = rememberNavBackStack(calculateInitialDestination(intentExtras))
 
     fun goBack(depth: Int = 1) {
+        println("Going back $depth times")
         if (backStack.size <= 1) onFinish()
         else repeat(depth) { backStack.removeAt(backStack.lastIndex) }
     }

app/src/main/java/at/bitfire/icsdroid/ui/screen/EditSubscriptionScreen.kt

@@ -4,7 +4,6 @@
 
 package at.bitfire.icsdroid.ui.screen
 
-import android.widget.Toast
 import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Column
@@ -29,7 +28,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -60,9 +58,10 @@ fun EditSubscriptionScreen(
         EditSubscriptionScreen(
             inputValid = model.inputValid,
             modelsDirty = model.modelsDirty,
-            successMessage = model.successMessage,
             onDelete = model::removeSubscription,
-            onSave = model::updateSubscription,
+            onSave = {
+                model.updateSubscription().invokeOnCompletion { onExit() }
+            },
             onShare = {
                 subscription.value?.let {
                     onShare(it)
@@ -102,7 +101,6 @@ fun EditSubscriptionScreen(
 fun EditSubscriptionScreen(
     inputValid: Boolean,
     modelsDirty: Boolean,
-    successMessage: String?,
     onDelete: () -> Unit,
     onSave: () -> Unit,
     onShare: () -> Unit,
@@ -133,12 +131,6 @@ fun EditSubscriptionScreen(
     onUsernameChange: (String) -> Unit,
     onPasswordChange: (String) -> Unit
 ) {
-    // show success message
-    successMessage?.let {
-        Toast.makeText(LocalContext.current, successMessage, Toast.LENGTH_LONG).show()
-        onExit()
-    }
-
     Scaffold(
         topBar = {
             AppBarComposable(
@@ -285,7 +277,6 @@ fun EditSubscriptionScreen_Preview() {
         EditSubscriptionScreen(
             inputValid = true,
             modelsDirty = false,
-            successMessage = "yay!",
             onDelete = {},
             onSave = {},
             onShare = {},