Advanced repeat rules

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", '"119"'
+		it.buildConfigField 'String', "TUTANOTA_MODEL_VERSION", '"80"'
 		it.buildConfigField 'String', 'RES_ADDRESS', '"tutanota"'
 	}
 
@@ -174,11 +174,15 @@ dependencies {
 	// JVM-based unit tests (that don't need a real device or emulator)
 	testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
 
+	androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito-inline-extended:2.28.1") {
+		exclude group: 'org.mockito', module: 'mockito-core'
+	}
+	androidTestImplementation "org.mockito:mockito-core:5.15.2"
+	androidTestImplementation "org.mockito.kotlin:mockito-kotlin:5.4.0"
 	androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 	androidTestImplementation 'androidx.test:runner:1.6.1'
 	androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.1'
 	androidTestImplementation 'androidx.test:rules:1.6.1'
-	androidTestImplementation 'org.mockito:mockito-android:5.12.0'
 	androidTestImplementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
 	androidTestImplementation 'androidx.room:room-testing:2.6.1'
 }

app-android/app/src/test/java/de/tutao/tutanota/AlarmModelTest.kt → app-android/app/src/androidTest/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 → app-android/app/src/androidTest/java/de/tutao/tutanota/AlarmNotificationsManagerTest.kt

@@ -21,27 +21,20 @@ import de.tutao.tutashared.push.SseStorage
 import de.tutao.tutashared.toBase64
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.Mockito
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.kotlin.any
 import org.mockito.kotlin.eq
 import org.mockito.stubbing.Answer
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-import org.robolectric.annotation.ConscryptMode
 import java.security.KeyStoreException
 import java.security.UnrecoverableEntryException
 import java.util.Calendar
 import java.util.Date
 import java.util.concurrent.TimeUnit
 
-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE)
-@ConscryptMode(ConscryptMode.Mode.OFF)
-class AlarmNotificationsManagerTest {
 
+class AlarmNotificationsManagerTest {
 	private lateinit var manager: AlarmNotificationsManager
 
 	private lateinit var systemAlarmFacade: SystemAlarmFacade
@@ -77,7 +70,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 +127,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/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/main/java/de/tutao/tutanota/alarms/SystemAlarmFacade.kt

@@ -8,7 +8,6 @@ import android.util.Log
 import de.tutao.tutanota.BuildConfig
 import java.util.Date
 
-
 class SystemAlarmFacade(private val context: Context) {
 	fun scheduleAlarmOccurrenceWithSystem(
 		alarmTime: Date,

app-android/app/src/main/java/de/tutao/tutanota/push/LocalNotificationsFacade.kt

@@ -50,7 +50,6 @@ private const val ALARM_NOTIFICATION_CHANNEL_ID = "alarms"
 private const val DOWNLOAD_NOTIFICATION_CHANNEL_ID = "downloads"
 private const val EMAIL_ADDRESS_EXTRA = "email_address"
 
-
 class LocalNotificationsFacade(private val context: Context, private val sseStorage: SseStorage) {
 	companion object {
 		private const val TAG = "LocalNotifications"

app-android/calendar/build.gradle.kts

@@ -1,5 +1,5 @@
 import com.android.build.gradle.internal.tasks.FinalizeBundleTask
-import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly
+import org.gradle.configurationcache.extensions.capitalized
 
 plugins {
 	id("com.android.application")
@@ -98,10 +98,10 @@ android {
 			val taskName = StringBuilder("sign").run {
 				//Add a task to rename the output file
 				productFlavors.forEach {
-					append(it.name.capitalizeAsciiOnly())
+					append(it.name.capitalized())
 				}
 
-				append(buildType.name.capitalizeAsciiOnly())
+				append(buildType.name.capitalized())
 				append("Bundle")
 
 				toString()
@@ -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", "\"119\"")
+		it.buildConfigField("String", "TUTANOTA_MODEL_VERSION", "\"80\"")
 		it.buildConfigField("String", "RES_ADDRESS", "\"tutanota\"")
 	}
 
@@ -208,11 +208,15 @@ dependencies {
 	// JVM-based unit tests (that don't need a real device or emulator)
 	testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version")
 
+	androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito-inline-extended:2.28.1") {
+		exclude(group = "org.mockito", module = "mockito-core")
+	}
+	androidTestImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
+	androidTestImplementation("org.mockito:mockito-core:5.15.2")
 	androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
 	androidTestImplementation("androidx.test:runner:1.4.0")
 	androidTestImplementation("androidx.test.ext:junit-ktx:1.1.3")
 	androidTestImplementation("androidx.test:rules:1.4.0")
-	androidTestImplementation("org.mockito:mockito-android:5.11.0")
 	androidTestImplementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
 	androidTestImplementation("androidx.room:room-testing:2.4.2")
 }

app-android/calendar/src/test/java/de/tutao/calendar/AlarmModelTest.kt → app-android/calendar/src/androidTest/java/de/tutao/calendar/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/calendar/src/test/java/de/tutao/calendar/AlarmNotificationsManagerTest.kt → app-android/calendar/src/androidTest/java/de/tutao/calendar/AlarmNotificationsManagerTest.kt

@@ -21,25 +21,18 @@ import de.tutao.tutashared.push.SseStorage
 import de.tutao.tutashared.toBase64
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.Mockito
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.kotlin.any
 import org.mockito.kotlin.eq
 import org.mockito.stubbing.Answer
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-import org.robolectric.annotation.ConscryptMode
 import java.security.KeyStoreException
 import java.security.UnrecoverableEntryException
 import java.util.Calendar
 import java.util.Date
 import java.util.concurrent.TimeUnit
 
-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE)
-@ConscryptMode(ConscryptMode.Mode.OFF)
 class AlarmNotificationsManagerTest {
 
 	private lateinit var manager: AlarmNotificationsManager
@@ -76,7 +69,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 +126,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/src/androidTest/java/de/tutao/calendar/EncryptionCompatTest.kt

@@ -193,18 +193,12 @@ class CompatibilityTest {
 	}
 
 	@Test
-	suspend fun argon2idTest() {
+	fun argon2idTest() = runBlocking {
 		for (td in testData.argon2idTests) {
 			val key = hexToBytes(td.keyHex)
 			val salt = hexToBytes(td.saltHex)
-			val result = crypto.argon2idGeneratePassphraseKey(
-				td.password,
-				salt.wrap()
-			)
-			assertArrayEquals(
-				key,
-				result.data
-			)
+			val password = td.password
+			assertArrayEquals(key, crypto.argon2idGeneratePassphraseKey(password, salt.wrap()).data)
 		}
 	}
 
@@ -218,9 +212,8 @@ class CompatibilityTest {
 				hexToBytes(testData.input).wrap(),
 				hexToBytes(testData.seed).wrap()
 			).data
-			//String hexResult = bytesToHex(encryptedResultBytes);
-			//assertEquals(testData.getResult(), hexResult);
-			//cannot compare encrypted test data because default android implementation ignores randomizer
+			val hexResult = bytesToHex(encryptedResult)
+			assertEquals(testData.result, hexResult)
 			val plainText = crypto.rsaDecrypt(hexToPrivateKey(testData.privateKey), encryptedResult.wrap()).data
 			assertEquals(testData.input, bytesToHex(plainText))
 			val plainTextFromTestData =
@@ -230,15 +223,23 @@ class CompatibilityTest {
 	}
 
 	@Test
-	@Throws(CryptoError::class)
-	fun kyber() = runBlocking {
+	fun kyber_roundtrip() = runBlocking {
 		for (td in testData.kyberEncryptionTests) {
-			// we need to use the same seed so that we always obtain the same encapsulation
 			val privateKey: KyberPrivateKey = hexToKyberPrivateKey(td.privateKey)
 			val publicKey: KyberPublicKey = hexToKyberPublicKey(td.publicKey)
 			val encapsulation = crypto.kyberEncapsulate(publicKey, hexToBytes(td.seed).wrap())
-			assertEquals(td.cipherText, bytesToHex(encapsulation.ciphertext.data))
-			assertEquals(td.sharedSecret, bytesToHex(encapsulation.sharedSecret.data))
+			val sharedSecret = crypto.kyberDecapsulate(privateKey, encapsulation.ciphertext)
+			assertEquals(encapsulation.sharedSecret, sharedSecret)
+		}
+	}
+
+	@Test
+	@Throws(CryptoError::class)
+	fun kyber() = runBlocking {
+		for (td in testData.kyberEncryptionTests) {
+			// we can't test encapsulation because we can't inject entropy in our current impl, only test decapsulation
+			// and roundtrip in another test
+			val privateKey: KyberPrivateKey = hexToKyberPrivateKey(td.privateKey)
 			val sharedSecret = crypto.kyberDecapsulate(privateKey, hexToBytes(td.cipherText).wrap())
 			assertEquals(td.sharedSecret, bytesToHex(sharedSecret.data))
 		}
@@ -381,9 +382,5 @@ class CompatibilityTest {
 				}
 			}
 		}
-
-		init {
-			System.loadLibrary("tutanota")
-		}
 	}
 }