Advanced repeat rules UI

app-android/app/build.gradle

@@ -83,8 +83,8 @@ android {
 	buildTypes.each {
 		it.buildConfigField 'String', 'FILE_PROVIDER_AUTHORITY', '"' + it.manifestPlaceholders['contentProviderAuthority'] + '"'
 		// keep in sync with src/native/main/NativePushServiceApp.ts
-		it.buildConfigField 'String', "SYS_MODEL_VERSION", '"99"'
-		it.buildConfigField 'String', "TUTANOTA_MODEL_VERSION", '"73"'
+		it.buildConfigField 'String', "SYS_MODEL_VERSION", '"118"'
+		it.buildConfigField 'String', "TUTANOTA_MODEL_VERSION", '"80"'
 		it.buildConfigField 'String', 'RES_ADDRESS', '"tutanota"'
 	}
 

app-android/app/src/main/java/de/tutao/tutanota/alarms/AlarmNotificationsManager.kt

@@ -3,6 +3,7 @@ package de.tutao.tutanota.alarms
 import android.util.Log
 import de.tutao.tutanota.*
 import de.tutao.tutanota.push.LocalNotificationsFacade
+import de.tutao.tutasdk.ByRule
 import de.tutao.tutashared.AndroidNativeCryptoFacade
 import de.tutao.tutashared.CryptoError
 import de.tutao.tutashared.OperationType
@@ -185,7 +186,6 @@ class AlarmNotificationsManager(
 		alarmNotification: EncryptedAlarmNotification,
 		pushKeyResolver: PushKeyResolver,
 	) {
-
 		// The DELETE notification we receive from the server has only placeholder fields and no keys. We must use our saved alarm to cancel notifications.
 		val savedAlarmNotification = sseStorage.readAlarmNotifications().find {
 			it.alarmInfo.identifier == alarmNotification.alarmInfo.identifier
@@ -243,10 +243,12 @@ class AlarmNotificationsManager(
 		val endValue = repeatRule.endValue
 		val excludedDates = repeatRule.excludedDates
 		val alarmTrigger: AlarmInterval = alarmNotification.alarmInfo.trigger
+		val byRules: List<ByRule> = alarmNotification.repeatRule?.advancedRules ?: listOf()
+
 		AlarmModel.iterateAlarmOccurrences(
 			Date(),
 			timeZone, eventStart, eventEnd, frequency, interval, endType,
-			endValue, alarmTrigger, TimeZone.getDefault(), excludedDates, callback
+			endValue, alarmTrigger, TimeZone.getDefault(), excludedDates, byRules, callback
 		)
 	}
 

app-android/app/src/test/java/de/tutao/tutanota/AlarmModelTest.kt

@@ -23,7 +23,7 @@ class AlarmModelTest {
 		val eventStart = getDate(timeZone, 2019, 4, 2, 12, 0)
 		iterateAlarmOccurrences(
 			now, timeZone, eventStart, eventStart, RepeatPeriod.WEEKLY,
-			1, EndType.NEVER, 0, AlarmInterval(AlarmIntervalUnit.HOUR, 1), timeZone, emptyList()
+			1, EndType.NEVER, 0, AlarmInterval(AlarmIntervalUnit.HOUR, 1), timeZone, emptyList(), emptyList()
 		) { time: Date, _: Int, _: Date? -> occurrences.add(time) }
 		Assert.assertArrayEquals(
 			listOf(
@@ -45,8 +45,18 @@ class AlarmModelTest {
 		val eventEnd = getAllDayDateUTC(getDate(timeZone, 2019, 4, 3, 0, 0), timeZone)
 		val repeatEnd = getAllDayDateUTC(getDate(timeZone, 2019, 4, 4, 0, 0), timeZone)
 		iterateAlarmOccurrences(
-			now, repeatTimeZone, eventStart, eventEnd, RepeatPeriod.DAILY,
-			1, EndType.UNTIL, repeatEnd.time, AlarmInterval(AlarmIntervalUnit.DAY, 1), timeZone, emptyList()
+			now,
+			repeatTimeZone,
+			eventStart,
+			eventEnd,
+			RepeatPeriod.DAILY,
+			1,
+			EndType.UNTIL,
+			repeatEnd.time,
+			AlarmInterval(AlarmIntervalUnit.DAY, 1),
+			timeZone,
+			emptyList(),
+			emptyList()
 		) { time: Date, _: Int, _: Date? -> occurrences.add(time) }
 		val expected = listOf( // Event on 2nd, alarm on 1st
 			getDate(timeZone, 2019, 4, 1, 0, 0),  // Event on 3rd, alarm on 2d

app-android/app/src/test/java/de/tutao/tutanota/AlarmNotificationsManagerTest.kt

@@ -77,7 +77,15 @@ class AlarmNotificationsManagerTest {
 		val repeatingAlarmIdentifier = "repeatingAlarmIdentifier"
 		val alarmNotification = createEncryptedAlarmNotification(userId, singleAlarmIdentifier, null, null)
 		val repeatRule =
-			EncryptedRepeatRule("1", "1", "Europe/Berlin", EndType.COUNT.ordinal.toString(), "2", emptyList())
+			EncryptedRepeatRule(
+				"1",
+				"1",
+				"Europe/Berlin",
+				EndType.COUNT.ordinal.toString(),
+				"2",
+				emptyList(),
+				emptyList()
+			)
 		val repeatingAlarmNotification = createEncryptedAlarmNotification(
 			userId, repeatingAlarmIdentifier, null, repeatRule
 		)
@@ -126,7 +134,15 @@ class AlarmNotificationsManagerTest {
 		val identifier = "notTooFarR"
 		val startDate = Date(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1))
 		val repeatRule =
-			EncryptedRepeatRule(RepeatPeriod.WEEKLY.value().toString(), "1", "Europe/Berlin", "0", "0", emptyList())
+			EncryptedRepeatRule(
+				RepeatPeriod.WEEKLY.value().toString(),
+				"1",
+				"Europe/Berlin",
+				"0",
+				"0",
+				emptyList(),
+				emptyList()
+			)
 		val alarmNotification = createEncryptedAlarmNotification(userId, identifier, startDate, repeatRule)
 		manager.scheduleNewAlarms(listOf(alarmNotification))
 

app-android/calendar/build.gradle.kts

@@ -123,8 +123,8 @@ android {
 			"\"" + it.manifestPlaceholders["contentProviderAuthority"] + "\""
 		)
 		// keep in sync with src/native/main/NativePushServiceApp.ts
-		it.buildConfigField("String", "SYS_MODEL_VERSION", "\"99\"")
-		it.buildConfigField("String", "TUTANOTA_MODEL_VERSION", "\"73\"")
+		it.buildConfigField("String", "SYS_MODEL_VERSION", "\"118\"")
+		it.buildConfigField("String", "TUTANOTA_MODEL_VERSION", "\"80\"")
 		it.buildConfigField("String", "RES_ADDRESS", "\"tutanota\"")
 	}
 

app-android/calendar/src/main/java/de/tutao/calendar/alarms/AlarmNotificationsManager.kt

@@ -3,6 +3,7 @@ package de.tutao.calendar.alarms
 import android.util.Log
 import de.tutao.calendar.*
 import de.tutao.calendar.push.LocalNotificationsFacade
+import de.tutao.tutasdk.ByRule
 import de.tutao.tutashared.AndroidNativeCryptoFacade
 import de.tutao.tutashared.CryptoError
 import de.tutao.tutashared.OperationType
@@ -229,10 +230,12 @@ class AlarmNotificationsManager(
 		val endValue = repeatRule.endValue
 		val excludedDates = repeatRule.excludedDates
 		val alarmTrigger: AlarmInterval = alarmNotification.alarmInfo.trigger
+		val byRules: List<ByRule> = alarmNotification.repeatRule?.advancedRules ?: listOf()
+
 		AlarmModel.iterateAlarmOccurrences(
 			Date(),
 			timeZone, eventStart, eventEnd, frequency, interval, endType,
-			endValue, alarmTrigger, TimeZone.getDefault(), excludedDates, callback
+			endValue, alarmTrigger, TimeZone.getDefault(), excludedDates, byRules, callback
 		)
 	}
 

app-android/calendar/src/main/java/de/tutao/calendar/alarms/SystemAlarmFacade.kt

@@ -5,6 +5,7 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.util.Log
+import de.tutao.calendar.BuildConfig
 import java.util.Date
 
 
@@ -17,7 +18,12 @@ class SystemAlarmFacade(private val context: Context) {
 		eventDate: Date,
 		user: String
 	) {
-		Log.d(TAG, "Scheduled notification $identifier")
+		if (BuildConfig.DEBUG) {
+			Log.d(TAG, "Scheduled notification $identifier at $alarmTime")
+		} else {
+			Log.d(TAG, "Scheduled notification $identifier")
+		}
+
 		val alarmManager = alarmManager
 		val pendingIntent = makeAlarmPendingIntent(occurrence, identifier, summary, eventDate, user)
 		alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, alarmTime.time, pendingIntent)

app-android/calendar/src/test/java/de/tutao/calendar/AlarmNotificationsManagerTest.kt

@@ -76,7 +76,15 @@ class AlarmNotificationsManagerTest {
 		val repeatingAlarmIdentifier = "repeatingAlarmIdentifier"
 		val alarmNotification = createEncryptedAlarmNotification(userId, singleAlarmIdentifier, null, null)
 		val repeatRule =
-			EncryptedRepeatRule("1", "1", "Europe/Berlin", EndType.COUNT.ordinal.toString(), "2", emptyList())
+			EncryptedRepeatRule(
+				"1",
+				"1",
+				"Europe/Berlin",
+				EndType.COUNT.ordinal.toString(),
+				"2",
+				emptyList(),
+				emptyList()
+			)
 		val repeatingAlarmNotification = createEncryptedAlarmNotification(
 			userId, repeatingAlarmIdentifier, null, repeatRule
 		)
@@ -125,7 +133,15 @@ class AlarmNotificationsManagerTest {
 		val identifier = "notTooFarR"
 		val startDate = Date(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1))
 		val repeatRule =
-			EncryptedRepeatRule(RepeatPeriod.WEEKLY.value().toString(), "1", "Europe/Berlin", "0", "0", emptyList())
+			EncryptedRepeatRule(
+				RepeatPeriod.WEEKLY.value().toString(),
+				"1",
+				"Europe/Berlin",
+				"0",
+				"0",
+				emptyList(),
+				emptyList()
+			)
 		val alarmNotification = createEncryptedAlarmNotification(userId, identifier, startDate, repeatRule)
 		manager.scheduleNewAlarms(listOf(alarmNotification))