Disable Notifications in shared Calendar

app/src/main/kotlin/at/bitfire/davdroid/db/AppDatabase.kt

@@ -46,11 +46,12 @@ import javax.inject.Singleton
     SyncStats::class,
     WebDavDocument::class,
     WebDavMount::class
-], exportSchema = true, version = 13, autoMigrations = [
+], exportSchema = true, version = 14, autoMigrations = [
     AutoMigration(from = 9, to = 10),
     AutoMigration(from = 10, to = 11),
     AutoMigration(from = 11, to = 12, spec = AppDatabase.AutoMigration11_12::class),
-    AutoMigration(from = 12, to = 13)
+    AutoMigration(from = 12, to = 13),
+    AutoMigration(from = 13, to = 14)
 ])
 @TypeConverters(Converters::class)
 abstract class AppDatabase: RoomDatabase() {

app/src/main/kotlin/at/bitfire/davdroid/db/Collection.kt

@@ -80,6 +80,9 @@ data class Collection(
     // CalDAV only
     var color: Int? = null,
 
+    /** Whether event alerts should be ignored. Only available on CalDAV */
+    var ignoreAlerts: Boolean? = null,
+
     /** timezone definition (full VTIMEZONE) - not a TZID! **/
     var timezone: String? = null,
 

app/src/main/kotlin/at/bitfire/davdroid/db/CollectionDao.kt

@@ -75,6 +75,9 @@ interface CollectionDao {
     @Query("UPDATE collection SET forceReadOnly=:forceReadOnly WHERE id=:id")
     fun updateForceReadOnly(id: Long, forceReadOnly: Boolean)
 
+    @Query("UPDATE collection SET ignoreAlerts=:ignoreAlerts WHERE id=:id")
+    fun updateIgnoreAlerts(id: Long, ignoreAlerts: Boolean)
+
     @Query("UPDATE collection SET sync=:sync WHERE id=:id")
     fun updateSync(id: Long, sync: Boolean)
 

app/src/main/kotlin/at/bitfire/davdroid/resource/LocalCalendar.kt

@@ -34,6 +34,8 @@ class LocalCalendar private constructor(
 
         private const val COLUMN_SYNC_STATE = Calendars.CAL_SYNC1
 
+        private const val COLUMN_IGNORE_ALERTS = Calendars.CAL_SYNC2
+
         fun create(account: Account, provider: ContentProviderClient, info: Collection): Uri {
             val values = valuesFromCollectionInfo(info, true)
 
@@ -45,6 +47,8 @@ class LocalCalendar private constructor(
             // user is ORGANIZER/ATTENDEE for a certain event.
             values.put(Calendars.OWNER_ACCOUNT, account.name)
 
+            values.put(COLUMN_IGNORE_ALERTS, info.ignoreAlerts)
+
             // flag as visible & synchronizable at creation, might be changed by user at any time
             values.put(Calendars.VISIBLE, 1)
             values.put(Calendars.SYNC_EVENTS, 1)
@@ -77,6 +81,8 @@ class LocalCalendar private constructor(
                 }
             }
 
+            values.put(COLUMN_IGNORE_ALERTS, info.ignoreAlerts)
+
             // add base values for Calendars
             values.putAll(calendarBaseValues)
 
@@ -108,6 +114,19 @@ class LocalCalendar private constructor(
             provider.update(calendarSyncURI(), values, null, null)
         }
 
+    var ignoreAlerts: Boolean?
+        get() = provider.query(calendarSyncURI(), arrayOf(COLUMN_IGNORE_ALERTS), null, null, null)?.use { cursor ->
+            if (cursor.moveToNext())
+                return cursor.getInt(0) == 1
+            else
+                null
+        }
+        set(state) {
+            val values = ContentValues(1)
+            values.put(COLUMN_IGNORE_ALERTS, state)
+            provider.update(calendarSyncURI(), values, null, null)
+        }
+
 
     override fun populate(info: ContentValues) {
         super.populate(info)

app/src/main/kotlin/at/bitfire/davdroid/settings/AccountSettingsMigrations.kt

@@ -41,13 +41,13 @@ import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
 import dagger.hilt.components.SingletonComponent
+import java.io.ByteArrayInputStream
+import java.io.ObjectInputStream
+import java.util.logging.Level
 import net.fortuna.ical4j.model.Property
 import net.fortuna.ical4j.model.property.Url
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.dmfs.tasks.contract.TaskContract
-import java.io.ByteArrayInputStream
-import java.io.ObjectInputStream
-import java.util.logging.Level
 
 class AccountSettingsMigrations(
     val context: Context,

app/src/main/kotlin/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt

@@ -30,6 +30,12 @@ import at.bitfire.davdroid.util.DavUtils
 import at.bitfire.ical4android.Event
 import at.bitfire.ical4android.InvalidCalendarException
 import at.bitfire.ical4android.util.DateUtils
+import java.io.ByteArrayOutputStream
+import java.io.Reader
+import java.io.StringReader
+import java.time.Duration
+import java.time.ZonedDateTime
+import java.util.logging.Level
 import net.fortuna.ical4j.model.Component
 import net.fortuna.ical4j.model.component.VAlarm
 import net.fortuna.ical4j.model.property.Action
@@ -38,12 +44,6 @@ import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.apache.commons.io.FileUtils
-import java.io.ByteArrayOutputStream
-import java.io.Reader
-import java.io.StringReader
-import java.time.Duration
-import java.time.ZonedDateTime
-import java.util.logging.Level
 
 /**
  * Synchronization manager for CalDAV collections; handles events (VEVENT)
@@ -203,6 +203,13 @@ class CalendarSyncManager(
             return
         }
 
+        // remove all alerts if the user has disabled them
+        if (localCollection.ignoreAlerts == true) {
+            for (event in events) {
+                event.alarms.clear()
+            }
+        }
+
         if (events.size == 1) {
             val event = events.first()
 

app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsActivity.kt

@@ -94,11 +94,11 @@ import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
+import java.text.Collator
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import java.text.Collator
-import javax.inject.Inject
 
 
 @AndroidEntryPoint

app/src/main/kotlin/at/bitfire/davdroid/ui/account/AccountActivity.kt

@@ -87,8 +87,8 @@ import at.bitfire.davdroid.util.TaskUtils
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
 import javax.inject.Inject
+import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
 class AccountActivity : AppCompatActivity() {
@@ -187,6 +187,9 @@ class AccountActivity : AppCompatActivity() {
                     onChangeForceReadOnly = { id, forceReadOnly ->
                         model.setCollectionForceReadOnly(id, forceReadOnly)
                     },
+                    onChangeIgnoreAlerts =  { id, ignoreAlerts ->
+                        model.setCollectionIgnoreAlerts(id, ignoreAlerts)
+                    },
                     onSubscribe = { item ->
                         installIcsx5 = !subscribeWebcal(item)
                     },
@@ -266,6 +269,7 @@ fun AccountOverview(
     subscriptions: LazyPagingItems<Collection>?,
     onUpdateCollectionSync: (collectionId: Long, sync: Boolean) -> Unit = { _, _ -> },
     onChangeForceReadOnly: (collectionId: Long, forceReadOnly: Boolean) -> Unit = { _, _ -> },
+    onChangeIgnoreAlerts: (collectionId: Long, ignoreAlerts: Boolean) -> Unit = { _, _ -> },
     onSubscribe: (Collection) -> Unit = {},
     installIcsx5: Boolean = false,
     onRefreshCollections: () -> Unit = {},
@@ -443,7 +447,8 @@ fun AccountOverview(
                                     progress = calDavProgress,
                                     collections = calendars,
                                     onUpdateCollectionSync = onUpdateCollectionSync,
-                                    onChangeForceReadOnly = onChangeForceReadOnly
+                                    onChangeForceReadOnly = onChangeForceReadOnly,
+                                    onChangeIgnoreAlerts = onChangeIgnoreAlerts
                                 )
                             }
 
@@ -699,6 +704,7 @@ fun ServiceTab(
     collections: LazyPagingItems<Collection>?,
     onUpdateCollectionSync: (collectionId: Long, sync: Boolean) -> Unit = { _, _ -> },
     onChangeForceReadOnly: (collectionId: Long, forceReadOnly: Boolean) -> Unit = { _, _ -> },
+    onChangeIgnoreAlerts: (collectionId: Long, ignoreAlerts: Boolean) -> Unit = { _, _ -> },
     onSubscribe: (Collection) -> Unit = {},
 ) {
     val context = LocalContext.current
@@ -744,6 +750,7 @@ fun ServiceTab(
                 onChangeSync = onUpdateCollectionSync,
                 onChangeForceReadOnly = onChangeForceReadOnly,
                 onSubscribe = onSubscribe,
+                onChangeIgnoreAlerts = onChangeIgnoreAlerts,
                 modifier = Modifier.weight(1f)
             )
     }

app/src/main/kotlin/at/bitfire/davdroid/ui/account/AccountModel.kt

@@ -58,13 +58,13 @@ import at.bitfire.ical4android.util.DateUtils
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import java.io.StringWriter
+import java.util.Optional
+import java.util.logging.Level
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
 import net.fortuna.ical4j.model.Calendar
-import java.io.StringWriter
-import java.util.Optional
-import java.util.logging.Level
 
 class AccountModel @AssistedInject constructor(
     val context: Application,
@@ -561,6 +561,10 @@ class AccountModel @AssistedInject constructor(
         db.collectionDao().updateForceReadOnly(id, forceReadOnly)
     }
 
+    fun setCollectionIgnoreAlerts(id: Long, ignoreAlerts: Boolean) = viewModelScope.launch(Dispatchers.IO) {
+        db.collectionDao().updateIgnoreAlerts(id, ignoreAlerts)
+    }
+
 
     // helpers
 

app/src/main/kotlin/at/bitfire/davdroid/ui/account/CollectionsList.kt

@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
@@ -58,6 +59,7 @@ fun CollectionsList(
     collections: LazyPagingItems<Collection>,
     onChangeSync: (collectionId: Long, sync: Boolean) -> Unit,
     onChangeForceReadOnly: (collectionId: Long, forceReadOnly: Boolean) -> Unit,
+    onChangeIgnoreAlerts: (collectionId: Long, ignoreAlerts: Boolean) -> Unit,
     modifier: Modifier = Modifier,
     onSubscribe: (collection: Collection) -> Unit = {}
 ) {
@@ -86,6 +88,10 @@ fun CollectionsList(
                         },
                         onChangeForceReadOnly = { forceReadOnly ->
                             onChangeForceReadOnly(item.id, forceReadOnly)
+                        },
+                        supportsIgnoreAlerts = item.type == Collection.TYPE_CALENDAR,
+                        onChangeIgnoreAlerts = { ignoreAlerts ->
+                            onChangeIgnoreAlerts(item.id, ignoreAlerts)
                         }
                     )
             }
@@ -98,7 +104,9 @@ fun CollectionsList(
 fun CollectionList_Item(
     collection: Collection,
     onChangeSync: (sync: Boolean) -> Unit = {},
-    onChangeForceReadOnly: (forceReadOnly: Boolean) -> Unit = {}
+    onChangeForceReadOnly: (forceReadOnly: Boolean) -> Unit = {},
+    supportsIgnoreAlerts: Boolean = false,
+    onChangeIgnoreAlerts: (ignoreAlerts: Boolean) -> Unit = {}
 ) {
     val context = LocalContext.current
 
@@ -122,7 +130,8 @@ fun CollectionList_Item(
             modifier = Modifier
                 .padding(horizontal = 4.dp)
                 .semantics {
-                    contentDescription = context.getString(R.string.account_synchronize_this_collection)
+                    contentDescription =
+                        context.getString(R.string.account_synchronize_this_collection)
                 }
         )
 
@@ -172,6 +181,35 @@ fun CollectionList_Item(
                 expanded = showOverflow,
                 onDismissRequest = { showOverflow = false }
             ) {
+                // Ignore alerts (only supported by caldav, obviously)
+                if (supportsIgnoreAlerts) {
+                    DropdownMenuItem(
+                        onClick = {
+                            onChangeIgnoreAlerts(
+                                if (collection.ignoreAlerts == true) false else true
+                            )
+                            showOverflow = false
+                        }
+                    ) {
+                        Row(
+                            verticalAlignment = Alignment.CenterVertically,
+                            modifier = Modifier.fillMaxWidth()
+                        ) {
+                            Text(
+                                text = stringResource(R.string.collection_ignore_alerts),
+                                modifier = Modifier.weight(1f)
+                            )
+                            Checkbox(
+                                checked = collection.ignoreAlerts == true,
+                                onCheckedChange = { ignoreAlerts ->
+                                    onChangeIgnoreAlerts(ignoreAlerts)
+                                    showOverflow = false
+                                }
+                            )
+                        }
+                    }
+                }
+
                 // force read-only (only show for collections that are modifiable on the server)
                 if (collection.privWriteContent)
                     DropdownMenuItem(
@@ -180,8 +218,14 @@ fun CollectionList_Item(
                             showOverflow = false
                         }
                     ) {
-                        Row(verticalAlignment = Alignment.CenterVertically) {
-                            Text(stringResource(R.string.collection_force_read_only))
+                        Row(
+                            verticalAlignment = Alignment.CenterVertically,
+                            modifier = Modifier.fillMaxWidth()
+                        ) {
+                            Text(
+                                text = stringResource(R.string.collection_force_read_only),
+                                modifier = Modifier.weight(1f)
+                            )
                             Checkbox(
                                 checked = collection.readOnly(),
                                 onCheckedChange = { forceReadOnly ->

app/src/main/res/values/strings.xml

@@ -398,6 +398,7 @@
     <string name="delete_collection_confirm_title">Are you sure?</string>
     <string name="delete_collection_confirm_warning">This collection (%s) and all its data will be removed permanently.</string>
     <string name="delete_collection_data_shall_be_deleted">These data shall be deleted from the server.</string>
+    <string name="collection_ignore_alerts">Ignore Alerts</string>
     <string name="collection_force_read_only">Force read-only</string>
     <string name="collection_properties">Properties</string>
     <string name="collection_properties_sync_time">Last synced</string>