Fix EditCalendarModel depending on other view models (#610)

* Join `EditCalendarModel` with `EditSubscriptionModel`

Signed-off-by: Arnau Mora <[email protected]>

* Fix annotations

Signed-off-by: Arnau Mora <[email protected]>

* Added missing assisted annotation

Signed-off-by: Arnau Mora <[email protected]>

* Moved method

Signed-off-by: Arnau Mora <[email protected]>

* Rename files for clarity

* Turn ValidationModel into injected ValidationRepository

* Rename the Validation test class as well

* Inject and use SubscriptionSettingsRepository

* Minor changes
- Spacing
- Remove unnecessary dispatcher
- add annotation qualifier

* Change back to ui state data class for consistency

* Fix test

* Rename ValidationRepository to ValidationModel

* Rename SubscriptionSettingsRepository to SubscriptionSettingsModel

* Rename and move

---------

Signed-off-by: Arnau Mora <[email protected]>
Co-authored-by: Sunik Kupfer <[email protected]>

Author: ArnyminerZ

…re/icsdroid/model/ValidationModelTest.kt …/icsdroid/model/ValidationUseCaseTest.ktapp/src/androidTest/java/at/bitfire/icsdroid/model/ValidationModelTest.kt renamed to app/src/androidTest/java/at/bitfire/icsdroid/model/ValidationUseCaseTest.kt app/src/androidTest/java/at/bitfire/icsdroid/model/ValidationModelTest.kt renamed to app/src/androidTest/java/at/bitfire/icsdroid/model/ValidationUseCaseTest.kt

@@ -20,7 +20,7 @@ import org.junit.BeforeClass
 import org.junit.Rule
 import org.junit.Test
 
-class ValidationModelTest {
+class ValidationUseCaseTest {
 
     companion object {
 
@@ -98,7 +98,7 @@ class ValidationModelTest {
     private fun validate(iCal: String): ResourceInfo {
         server.enqueue(MockResponse().setBody(iCal))
 
-        val model = ValidationModel(app)
+        val model = ValidationUseCase(app)
         runBlocking {
             // Wait until the validation completed
             model.validate(server.url("/").toAndroidUri(), null, null).join()

…csdroid/model/CreateSubscriptionModel.kt …e/icsdroid/model/AddSubscriptionModel.ktapp/src/main/java/at/bitfire/icsdroid/model/CreateSubscriptionModel.kt renamed to app/src/main/java/at/bitfire/icsdroid/model/AddSubscriptionModel.kt app/src/main/java/at/bitfire/icsdroid/model/CreateSubscriptionModel.kt renamed to app/src/main/java/at/bitfire/icsdroid/model/AddSubscriptionModel.kt

@@ -24,16 +24,18 @@ import java.net.URISyntaxException
 import javax.inject.Inject
 
 @HiltViewModel
-class CreateSubscriptionModel @Inject constructor(
+class AddSubscriptionModel @Inject constructor(
     @param:ApplicationContext private val context: Context,
-    private val db: AppDatabase
+    private val db: AppDatabase,
+    val validationUseCase: ValidationUseCase,
+    val subscriptionSettingsUseCase: SubscriptionSettingsUseCase
 ) : ViewModel() {
 
     data class UiState(
         val success: Boolean = false,
         val errorMessage: String? = null,
         val isCreating: Boolean = false,
-        val showNextButton: Boolean = false
+        val showNextButton: Boolean = false,
     )
 
     var uiState by mutableStateOf(UiState())
@@ -43,53 +45,81 @@ class CreateSubscriptionModel @Inject constructor(
         uiState = uiState.copy(showNextButton = value)
     }
 
+    fun resetValidationResult() = validationUseCase.resetResult()
+    fun validateUrl(originalUri: Uri, username: String? = null, password: String? = null) =
+        validationUseCase.validate(originalUri, username, password)
+    
+    fun checkUrlIntroductionPage() {
+        with(subscriptionSettingsUseCase) {
+            if (validationUseCase.uiState.isVerifyingUrl) {
+                setShowNextButton(true)
+            } else {
+                val uri = validateUri(
+                    url = uiState.url,
+                    onSetUrl = ::setUrl,
+                    onSetCredentials = { username, password ->
+                        setUsername(username)
+                        setPassword(password)
+                    },
+                    requiresAuth = uiState.requiresAuth,
+                    onSetRequiresAuth = ::setRequiresAuth,
+                    onSetIsInsecure = ::setIsInsecure,
+                    onSetUrlError = ::setUrlError
+                )
+                val authOK =
+                    if (uiState.requiresAuth)
+                        !uiState.username.isNullOrEmpty() &&
+                                !uiState.password.isNullOrEmpty()
+                    else
+                        true
+                setShowNextButton(uri != null && authOK)
+            }
+        }
+    }
+
     /**
      * Creates a new subscription taking the data from the given models.
      */
-    fun create(
-        subscriptionSettingsModel: SubscriptionSettingsModel,
-    ) {
-        viewModelScope.launch(Dispatchers.IO) {
-            uiState = uiState.copy(isCreating = true)
-            try {
+    fun createSubscription() = viewModelScope.launch(Dispatchers.IO) {
+        uiState = uiState.copy(isCreating = true)
+        try {
+            with(subscriptionSettingsUseCase.uiState) {
                 val subscription = Subscription(
-                    displayName = subscriptionSettingsModel.uiState.title!!,
-                    url = Uri.parse(subscriptionSettingsModel.uiState.url),
-                    color = subscriptionSettingsModel.uiState.color,
-                    ignoreEmbeddedAlerts = subscriptionSettingsModel.uiState.ignoreAlerts,
-                    defaultAlarmMinutes = subscriptionSettingsModel.uiState.defaultAlarmMinutes,
-                    defaultAllDayAlarmMinutes = subscriptionSettingsModel.uiState.defaultAllDayAlarmMinutes,
-                    ignoreDescription = subscriptionSettingsModel.uiState.ignoreDescription,
+                    displayName = title!!,
+                    url = Uri.parse(url),
+                    color = color,
+                    ignoreEmbeddedAlerts = ignoreAlerts,
+                    defaultAlarmMinutes = defaultAlarmMinutes,
+                    defaultAllDayAlarmMinutes = defaultAllDayAlarmMinutes,
+                    ignoreDescription = ignoreDescription,
                 )
 
                 /** A list of all the ids of the inserted rows */
                 val id = db.subscriptionsDao().add(subscription)
 
                 // Create the credential in the IO thread
-                if (subscriptionSettingsModel.uiState.requiresAuth) {
+                if (requiresAuth) {
                     // If the subscription requires credentials, create them
-                    val username = subscriptionSettingsModel.uiState.username
-                    val password = subscriptionSettingsModel.uiState.password
                     if (username != null && password != null) {
-                        val credential = Credential(
-                            subscriptionId = id,
-                            username = username,
-                            password = password
+                        db.credentialsDao().create(
+                            Credential(
+                                subscriptionId = id,
+                                username = username,
+                                password = password
+                            )
                         )
-                        db.credentialsDao().create(credential)
                     }
                 }
 
                 // sync the subscription to reflect the changes in the calendar provider
                 SyncWorker.run(context)
-
-                uiState = uiState.copy(success = true)
-            } catch (e: Exception) {
-                Log.e(Constants.TAG, "Couldn't create calendar", e)
-                uiState = uiState.copy(errorMessage = e.localizedMessage ?: e.message)
-            } finally {
-                uiState = uiState.copy(isCreating = false)
             }
+            uiState = uiState.copy(success = true)
+        } catch (e: Exception) {
+            Log.e(Constants.TAG, "Couldn't create calendar", e)
+            uiState = uiState.copy(errorMessage = e.localizedMessage ?: e.message)
+        } finally {
+            uiState = uiState.copy(isCreating = false)
         }
     }
 
@@ -172,33 +202,4 @@ class CreateSubscriptionModel @Inject constructor(
         }
         return uri
     }
-
-    fun checkUrlIntroductionPage(
-        subscriptionSettingsModel: SubscriptionSettingsModel,
-        validationModel: ValidationModel
-    ) {
-        if (validationModel.uiState.isVerifyingUrl) {
-            setShowNextButton(true)
-        } else {
-            val uri = validateUri(
-                url = subscriptionSettingsModel.uiState.url,
-                onSetUrl = subscriptionSettingsModel::setUrl,
-                onSetCredentials = { username, password ->
-                    subscriptionSettingsModel.setUsername(username)
-                    subscriptionSettingsModel.setPassword(password)
-                },
-                requiresAuth = subscriptionSettingsModel.uiState.requiresAuth,
-                onSetRequiresAuth = subscriptionSettingsModel::setRequiresAuth,
-                onSetIsInsecure = subscriptionSettingsModel::setIsInsecure,
-                onSetUrlError = subscriptionSettingsModel::setUrlError
-            )
-            val authOK =
-                if (subscriptionSettingsModel.uiState.requiresAuth)
-                    !subscriptionSettingsModel.uiState.username.isNullOrEmpty() &&
-                            !subscriptionSettingsModel.uiState.password.isNullOrEmpty()
-                else
-                    true
-            setShowNextButton(uri != null && authOK)
-        }
-    }
 }