Merge branch 'dev' into nav3-migration/edit-subscription-activity

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/at/bitfire/icsdroid/model/EditSubscriptionModel.kt
#	app/src/main/java/at/bitfire/icsdroid/ui/nav/MainApp.kt

Author: ArnyminerZ

.github/dependabot.yml

@@ -9,7 +9,15 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+    commit-message:
+      prefix: "[CI] "
+    groups:
+      ci-actions:
+        patterns: ["*"]
   - package-ecosystem: "gradle"
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    groups:
+      lib-dependencies:
+        patterns: ["*"]

app/src/main/AndroidManifest.xml

@@ -114,10 +114,6 @@
                 <data android:mimeType="text/calendar" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.InfoActivity"
-            android:label="@string/activity_app_info"
-            android:parentActivityName=".MainActivity" />
 
     </application>
 

app/src/main/java/at/bitfire/icsdroid/MainActivity.kt

@@ -21,7 +21,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         setContentThemed {
-            MainApp(savedInstanceState, intent.extras, ::finish)
+            MainApp(savedInstanceState, intent, ::finish)
         }
     }
 

app/src/main/java/at/bitfire/icsdroid/db/dao/SubscriptionsDao.kt

@@ -47,7 +47,7 @@ interface SubscriptionsDao {
     suspend fun getByUrl(url: String): Subscription?
 
     @Query("SELECT * FROM subscriptions WHERE id=:id")
-    fun getWithCredentialsByIdFlow(id: Long): Flow<SubscriptionWithCredential?>
+    suspend fun getWithCredentialsById(id: Long): SubscriptionWithCredential?
 
     @Query("SELECT errorMessage FROM subscriptions WHERE id=:id")
     fun getErrorMessageFlow(id: Long): Flow<String?>

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

@@ -23,7 +23,6 @@ import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
@@ -42,7 +41,7 @@ class EditSubscriptionModel @AssistedInject constructor(
 
     private var initialSubscription: Subscription? = null
     private var initialCredential: Credential? = null
-    private var initialRequiresAuthValue: Boolean? = null
+    private val initialRequiresAuth: Boolean get() = initialCredential != null
 
     /**
      * Whether user input is error free
@@ -69,7 +68,7 @@ class EditSubscriptionModel @AssistedInject constructor(
         get() = with(subscriptionSettingsUseCase) {
             val requiresAuth = uiState.requiresAuth
 
-            val credentialsDirty = initialRequiresAuthValue != requiresAuth || initialCredential?.let {
+            val credentialsDirty = initialRequiresAuth != requiresAuth || initialCredential?.let {
                 !equalsCredential(it)
             } ?: false
             val subscriptionsDirty = initialSubscription?.let {
@@ -79,49 +78,34 @@ class EditSubscriptionModel @AssistedInject constructor(
             credentialsDirty || subscriptionsDirty
         }
 
-    val subscription = db.subscriptionsDao().getByIdFlow(subscriptionId)
-    val subscriptionWithCredential = db.subscriptionsDao().getWithCredentialsByIdFlow(subscriptionId)
+    var successMessage: String? by mutableStateOf(null)
+        private set
+
+    var subscriptionWithCredential: SubscriptionsDao.SubscriptionWithCredential? = null
+        private set
 
     init {
-        // Initialise view models and save their initial state
         viewModelScope.launch {
-            subscriptionWithCredential.collect { data ->
-                if (data != null)
-                    onSubscriptionLoaded(data)
+            db.subscriptionsDao().getWithCredentialsById(subscriptionId)?.let {
+                onSubscriptionLoaded(it)
             }
         }
     }
 
     /**
      * Initialise view models and remember their initial state
      */
-    private fun onSubscriptionLoaded(subscriptionWithCredential: SubscriptionsDao.SubscriptionWithCredential) =
-        with(subscriptionSettingsUseCase) {
-            val subscription = subscriptionWithCredential.subscription
-
-            setUrl(subscription.url.toString())
-            setTitle(subscription.displayName)
-            setColor(subscription.color)
-            setCustomUserAgent(subscription.customUserAgent)
-            setIgnoreAlerts(subscription.ignoreEmbeddedAlerts)
-            setDefaultAlarmMinutes(subscription.defaultAlarmMinutes?.toString())
-            setDefaultAllDayAlarmMinutes(subscription.defaultAllDayAlarmMinutes?.toString())
-            setIgnoreDescription(subscription.ignoreDescription)
-
-            val credential = subscriptionWithCredential.credential
-            val requiresAuth = credential != null
-            setRequiresAuth(requiresAuth)
-
-            if (credential != null) {
-                setUsername(credential.username)
-                setPassword(credential.password)
-            }
+    private fun onSubscriptionLoaded(subscriptionWithCredential: SubscriptionsDao.SubscriptionWithCredential) {
+        val subscription = subscriptionWithCredential.subscription
+        val credential = subscriptionWithCredential.credential
 
-            // Save state, before user makes changes
-            initialSubscription = subscription
-            initialCredential = credential
-            initialRequiresAuthValue = uiState.requiresAuth
-        }
+        // Save the initial state, before updating the UI, so the state is persisted
+        initialSubscription = subscription
+        initialCredential = credential
+        this.subscriptionWithCredential = subscriptionWithCredential
+
+        subscriptionSettingsUseCase.update(subscription, credential)
+    }
 
     private suspend fun showMessage(@StringRes message: Int) = withContext(Dispatchers.Main) {
         Toast.makeText(context, message, Toast.LENGTH_LONG).show()
@@ -132,7 +116,7 @@ class EditSubscriptionModel @AssistedInject constructor(
      */
     fun updateSubscription() = with(subscriptionSettingsUseCase.uiState) {
         viewModelScope.launch(Dispatchers.IO) {
-            subscription.firstOrNull()?.let { subscription ->
+            subscriptionWithCredential?.let { (subscription) ->
                 val newSubscription = subscription.copy(
                     displayName = title ?: subscription.displayName,
                     color = color,
@@ -164,7 +148,7 @@ class EditSubscriptionModel @AssistedInject constructor(
      */
     fun removeSubscription() {
         viewModelScope.launch(Dispatchers.IO) {
-            subscription.firstOrNull()?.let { subscription ->
+            subscriptionWithCredential?.let { (subscription) ->
                 db.subscriptionsDao().delete(subscription)
 
                 // sync the subscription to reflect the changes in the calendar provider

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

@@ -81,6 +81,23 @@ class SubscriptionSettingsUseCase @Inject constructor() {
         uiState = uiState.copy(ignoreDescription = value)
     }
 
+    fun update(subscription: Subscription, credential: Credential?) {
+        uiState = uiState.copy(
+            url = subscription.url.toString(),
+            title = subscription.displayName,
+            color = subscription.color,
+            customUserAgent = subscription.customUserAgent,
+            ignoreAlerts = subscription.ignoreEmbeddedAlerts,
+            defaultAlarmMinutes = subscription.defaultAlarmMinutes,
+            defaultAllDayAlarmMinutes = subscription.defaultAllDayAlarmMinutes,
+            ignoreDescription = subscription.ignoreDescription,
+
+            requiresAuth = credential != null,
+            username = credential?.username,
+            password = credential?.password
+        )
+    }
+
     fun equalsSubscription(subscription: Subscription) =
         uiState.url == subscription.url.toString()
             && uiState.title == subscription.displayName