Merge branch 'develop' of https://github.com/TechbeeAT/jtxBoard into develop

patrickunterwegs · patrickunterwegs · commit 736662d632d3 · 2025-06-19T11:32:50.000+02:00
diff --git a/app/src/main/java/at/techbee/jtx/database/ICalDatabaseDao.kt b/app/src/main/java/at/techbee/jtx/database/ICalDatabaseDao.kt
@@ -475,6 +475,13 @@ interface ICalDatabaseDao {
     @Delete
     fun deleteICalCollection(collection: ICalCollection)
 
+    /**
+     * Delete ICalCollections by their Ids
+     * @param [collectionIds] of the collections to be deleted.
+     */
+    @Query("DELETE FROM $TABLE_NAME_COLLECTION WHERE $COLUMN_COLLECTION_ID in (:collectionIds)")
+    fun deleteICalCollectionsByIds(collectionIds: List<Long>)
+
     /**
      * Delete all collections of an account.
      * @param [accountName] and [accountType] of the Account to be deleted.
diff --git a/app/src/main/java/at/techbee/jtx/ui/list/ListScreenTabContainer.kt b/app/src/main/java/at/techbee/jtx/ui/list/ListScreenTabContainer.kt
@@ -14,6 +14,7 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.location.LocationListener
 import android.location.LocationManager
+import android.os.Build
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
@@ -54,9 +55,11 @@ import androidx.compose.material3.rememberDrawerState
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -75,9 +78,12 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.core.app.ActivityCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import at.techbee.jtx.R
+import at.techbee.jtx.database.ICalCollection
 import at.techbee.jtx.database.ICalDatabase
 import at.techbee.jtx.database.ICalObject
 import at.techbee.jtx.database.Module
@@ -92,6 +98,7 @@ import at.techbee.jtx.ui.GlobalStateHolder
 import at.techbee.jtx.ui.reusable.appbars.JtxNavigationDrawer
 import at.techbee.jtx.ui.reusable.destinations.DetailDestination
 import at.techbee.jtx.ui.reusable.dialogs.CollectionSelectorDialog
+import at.techbee.jtx.ui.reusable.dialogs.DeleteObsoleteCollectionsDialog
 import at.techbee.jtx.ui.reusable.dialogs.DeleteSelectedDialog
 import at.techbee.jtx.ui.reusable.dialogs.ErrorOnUpdateDialog
 import at.techbee.jtx.ui.reusable.dialogs.UpdateEntriesDialog
@@ -221,6 +228,7 @@ fun ListScreenTabContainer(
     var showDeleteSelectedDialog by rememberSaveable { mutableStateOf(false) }
     var showUpdateEntriesDialog by rememberSaveable { mutableStateOf(false) }
     var showCollectionSelectorDialog by rememberSaveable { mutableStateOf(false) }
+    val obsoleteCollections = remember { mutableStateListOf<ICalCollection>() }
 
     val availableSyncApps = SyncUtil.availableSyncApps(context)
     var isRefreshing by remember { mutableStateOf(false) }
@@ -250,6 +258,18 @@ fun ListScreenTabContainer(
         }
     }
 
+    val lifecycleOwner = LocalLifecycleOwner.current
+    val lifecycleState by lifecycleOwner.lifecycle.currentStateFlow.collectAsState()
+    LaunchedEffect(lifecycleState) {
+        if (lifecycleState == Lifecycle.State.RESUMED) {
+            scope.launch(Dispatchers.IO) {
+                val allCollections = database.getAllCollectionsSync()
+                obsoleteCollections.clear()
+                obsoleteCollections.addAll(SyncUtil.getObsoleteCollections(allCollections, context))
+            }
+        }
+    }
+
 
     val drawerState = rememberDrawerState(DrawerValue.Closed)
     val filterSheetState = rememberModalBottomSheetState()
@@ -303,6 +323,17 @@ fun ListScreenTabContainer(
         )
     }
 
+    if (obsoleteCollections.isNotEmpty() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {  // don't show it for versions of Android 7 and lower as this was not recognized properly in the past
+        DeleteObsoleteCollectionsDialog(
+            collections = obsoleteCollections,
+            onConfirm = {
+                listViewModel.deleteCollections(obsoleteCollections.toList()) // adding toList() here, otherwise the list would be cleared before it's processed
+                obsoleteCollections.clear()
+            },
+            onDismiss = { obsoleteCollections.clear() }
+        )
+    }
+
     if(getActiveViewModel().sqlConstraintException.value) {
         ErrorOnUpdateDialog(onConfirm = { getActiveViewModel().sqlConstraintException.value = false })
     }
diff --git a/app/src/main/java/at/techbee/jtx/ui/list/ListViewModel.kt b/app/src/main/java/at/techbee/jtx/ui/list/ListViewModel.kt
@@ -26,6 +26,7 @@ import androidx.lifecycle.switchMap
 import androidx.lifecycle.viewModelScope
 import androidx.preference.PreferenceManager
 import androidx.sqlite.db.SimpleSQLiteQuery
+import at.techbee.jtx.MainActivity2
 import at.techbee.jtx.NotificationPublisher
 import at.techbee.jtx.R
 import at.techbee.jtx.database.Classification
@@ -458,6 +459,17 @@ open class ListViewModel(application: Application, val module: Module) : Android
         }
     }
 
+    /**
+     * Deletes the selected collections
+     * @param collections to be deleted
+     */
+    fun deleteCollections(collections: List<ICalCollection>) {
+        viewModelScope.launch(Dispatchers.IO) {
+            databaseDao.deleteICalCollectionsByIds(collections.map { it.collectionId })
+            MainActivity2.restoreNotificationChannels(_application)
+        }
+    }
+
     /**
      * Notifies the contentObservers
      * schedules the notifications
diff --git a/app/src/main/java/at/techbee/jtx/ui/reusable/dialogs/DeleteObsoleteCollectionsDialog.kt b/app/src/main/java/at/techbee/jtx/ui/reusable/dialogs/DeleteObsoleteCollectionsDialog.kt
@@ -0,0 +1,97 @@
+package at.techbee.jtx.ui.reusable.dialogs
+
+/*
+ * Copyright (c) Techbee e.U.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import at.techbee.jtx.R
+import at.techbee.jtx.database.ICalCollection
+
+
+@Composable
+fun DeleteObsoleteCollectionsDialog(
+    collections: List<ICalCollection>,
+    onConfirm: () -> Unit,
+    onDismiss: () -> Unit
+) {
+
+    AlertDialog(
+        onDismissRequest = { onDismiss() },
+        title = { Text(stringResource(id = R.string.dialog_delete_obsolete_collections_title)) },
+        text = {
+            Column(
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+                modifier = Modifier.verticalScroll(rememberScrollState())
+            ) {
+                Text(
+                    text = stringResource(R.string.dialog_delete_obsolete_collections_message),
+                    modifier = Modifier.padding(bottom = 8.dp)
+                )
+
+                Text(
+                    text = collections.joinToString(separator = System.lineSeparator()) { "${it.displayName ?: ""} (${it.accountName})" },
+                    fontStyle = FontStyle.Italic
+                )
+            }
+               },
+        confirmButton = {
+            TextButton(
+                onClick = {
+                    onConfirm()
+                }
+            ) {
+                Text(stringResource(id = R.string.delete))
+            }
+        },
+        dismissButton = {
+            TextButton(
+                onClick = {
+                    onDismiss()
+                }
+            ) {
+                Text( stringResource(id = R.string.cancel))
+            }
+        }
+    )
+
+}
+
+@Preview(showBackground = true)
+@Composable
+fun DeleteObsoleteCollectionsDialog_Preview() {
+    MaterialTheme {
+
+        DeleteObsoleteCollectionsDialog(
+            collections = listOf(
+                ICalCollection(
+                    displayName = "Collection 1",
+                    accountName = "Account 1"),
+                ICalCollection(
+                    displayName = "Collection 2",
+                    accountName = "Account 2"
+                )
+            ),
+            onConfirm = { },
+            onDismiss = { }
+        )
+    }
+}
diff --git a/app/src/main/java/at/techbee/jtx/util/SyncUtil.kt b/app/src/main/java/at/techbee/jtx/util/SyncUtil.kt
@@ -9,6 +9,7 @@
 package at.techbee.jtx.util
 
 import android.accounts.Account
+import android.accounts.AccountManager
 import android.content.ActivityNotFoundException
 import android.content.ContentResolver
 import android.content.Context
@@ -27,6 +28,8 @@ import at.techbee.jtx.BuildConfig
 import at.techbee.jtx.R
 import at.techbee.jtx.SYNC_PROVIDER_AUTHORITY
 import at.techbee.jtx.contract.JtxContract
+import at.techbee.jtx.database.ICalCollection
+import at.techbee.jtx.database.ICalCollection.Factory.LOCAL_ACCOUNT_TYPE
 
 const val TAG = "SyncUtil"
 
@@ -55,6 +58,31 @@ class SyncUtil {
             }
         }
 
+
+        /**
+         * Retrieves a list of all collections that have an account that cannot be found in the account manager anymore
+         *
+         * @param collections The list of collections to check.
+         * @param context The application context.
+         * @return A list of obsolete collections
+         */
+        fun getObsoleteCollections(collections: List<ICalCollection>, context: Context): List<ICalCollection> {
+
+            val foundAccounts = mutableSetOf<Account>()
+            collections.map { it.accountType }.distinct().forEach { accountType ->
+                if(accountType == LOCAL_ACCOUNT_TYPE)
+                    return@forEach
+                val account = AccountManager.get(context).getAccountsByType(accountType)
+                foundAccounts.addAll(account)
+            }
+            val obsoleteCollections = mutableListOf<ICalCollection>()
+            collections.forEach { collection ->
+                if(!foundAccounts.contains(collection.getAccount()) && collection.accountType != LOCAL_ACCOUNT_TYPE)
+                    obsoleteCollections.add(collection)
+            }
+            return obsoleteCollections
+        }
+
         fun showSyncRequestedToast(context: Context) = Toast.makeText(context, context.getString(R.string.toast_sync_requested), Toast.LENGTH_SHORT).show()
 
         /**
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -510,6 +510,8 @@ Thank you!"</string>
     <string name="dialog_edit_stored_resource_title">"Add/edit resource preset"</string>
     <string name="dialog_edit_stored_status_title">"Add/edit status preset"</string>
     <string name="dialog_add_audio_entry_title">"Add audio entry"</string>
+    <string name="dialog_delete_obsolete_collections_title">"Delete collections of missing accounts?"</string>
+    <string name="dialog_delete_obsolete_collections_message">"The accounts of the following collections cannot be found anymore. Would you like to delete them?"</string>
     <string name="menu_list_viewmode_compact">"Compact view"</string>
     <string name="menu_list_viewmode_kanban">"Kanban view"</string>
     <string name="menu_list_viewmode_week">"Week view"</string>
