[iOS] Integrates SDK event expansion during alarm scheduling

app-ios/TutanotaSharedFramework/Alarms/AlarmModel.swift

@@ -1,4 +1,5 @@
 import Foundation
+import tutasdk
 
 /// Identifier for when event will happen
 public struct EventOccurrence {
@@ -91,7 +92,14 @@ public class AlarmModel: AlarmCalculator {
 
 		cal.timeZone = isAllDayEvent ? localTimeZone : TimeZone(identifier: repeatRule.timeZone) ?? localTimeZone
 
-		return LazyEventSequence(calcEventStart: calcEventStart, endDate: endDate, repeatRule: repeatRule, cal: cal, calendarComponent: calendarUnit)
+		return LazyEventSequence(
+			calcEventStart: calcEventStart,
+			endDate: endDate,
+			repeatRule: repeatRule,
+			cal: cal,
+			calendarComponent: calendarUnit,
+			dateProvider: self.dateProvider
+		)
 	}
 
 	static func alarmTime(trigger: AlarmInterval, eventTime: Date) -> Date {
@@ -111,22 +119,48 @@ private struct LazyEventSequence: Sequence, IteratorProtocol {
 	let repeatRule: RepeatRule
 	let cal: Calendar
 	let calendarComponent: Calendar.Component
+	let dateProvider: DateProvider
+
+	var expandedEvents: [DateTime] = []
 
-	fileprivate var ocurrenceNumber = 0
+	fileprivate var intervalNumber = 0
+	fileprivate var occurrenceNumber = 0
 	fileprivate var exclusionNumber = 0
 
 	mutating func next() -> EventOccurrence? {
-		if case let .count(n) = repeatRule.endCondition, ocurrenceNumber >= n { return nil }
-		let occurrenceDate = cal.date(byAdding: self.calendarComponent, value: repeatRule.interval * ocurrenceNumber, to: calcEventStart)!
-		if let endDate, occurrenceDate >= endDate {
-			return nil
-		} else {
-			let occurrence = EventOccurrence(occurrenceNumber: ocurrenceNumber, occurenceDate: occurrenceDate)
-			ocurrenceNumber += 1
+		if case let .count(n) = repeatRule.endCondition, occurrenceNumber >= n { return nil }
+
+		if expandedEvents.isEmpty {
+			let nextExpansionProgenitor = cal.date(byAdding: self.calendarComponent, value: repeatRule.interval * intervalNumber, to: calcEventStart)!
+			let progenitorTime = UInt64(nextExpansionProgenitor.timeIntervalSince1970)
+			let eventFacade = EventFacade()
+			let byRules = repeatRule.advancedRules.map { $0.toSDKRule() }
+			let generatedEvents = eventFacade.generateFutureInstances(
+				date: progenitorTime * 1000,
+				repeatRule: EventRepeatRule(frequency: repeatRule.frequency.toSDKPeriod(), byRules: byRules)
+			)
+			self.expandedEvents.append(contentsOf: generatedEvents)
+			// Handle the event 0
+			if self.intervalNumber == 0 && !self.expandedEvents.contains(progenitorTime) { expandedEvents.append(progenitorTime) }
+
+			intervalNumber += 1
+		}
+
+		if let date = expandedEvents.popLast() {
+			occurrenceNumber += 1
+
+			if let endDate, date >= UInt64(endDate.timeIntervalSince1970) { return nil }
 
-			while exclusionNumber < repeatRule.excludedDates.count && repeatRule.excludedDates[exclusionNumber] < occurrenceDate { exclusionNumber += 1 }
-			if exclusionNumber < repeatRule.excludedDates.count && repeatRule.excludedDates[exclusionNumber] == occurrenceDate { return self.next() }
-			return occurrence
+			while exclusionNumber < repeatRule.excludedDates.count && UInt64(repeatRule.excludedDates[exclusionNumber].timeIntervalSince1970) < date {
+				exclusionNumber += 1
+			}
+			if exclusionNumber < repeatRule.excludedDates.count && UInt64(repeatRule.excludedDates[exclusionNumber].timeIntervalSince1970) == date {
+				return self.next()
+			}
+
+			return EventOccurrence(occurrenceNumber: occurrenceNumber, occurenceDate: Date(timeIntervalSince1970: Double(date)))
+		} else {
+			return self.next()
 		}
 	}
 }
@@ -174,3 +208,14 @@ private func calendarUnit(for repeatPeriod: RepeatPeriod) -> Calendar.Component
 	case .annually: return .year
 	}
 }
+
+private extension RepeatPeriod {
+	func toSDKPeriod() -> tutasdk.RepeatPeriod {
+		switch self {
+		case .annually: return tutasdk.RepeatPeriod.annually
+		case .daily: return tutasdk.RepeatPeriod.daily
+		case .monthly: return tutasdk.RepeatPeriod.monthly
+		case .weekly: return tutasdk.RepeatPeriod.weekly
+		}
+	}
+}

app-ios/TutanotaSharedFramework/Alarms/RepeatRule.swift

@@ -4,6 +4,7 @@ struct RepeatRule: Equatable {
 	let timeZone: String
 	let endCondition: RepeatEndCondition
 	let excludedDates: [Date]
+	let advancedRules: [AdvancedRule]
 }
 
 extension RepeatRule {
@@ -16,5 +17,13 @@ extension RepeatRule {
 		self.endCondition = RepeatEndCondition(endType: endType, endValue: endValue ?? 0)
 		let decryptedExclusions: [Date] = try encrypted.excludedDates.map { try decrypt(base64: $0.date, key: sessionKey) }
 		self.excludedDates = decryptedExclusions
+		let advancedRules: [AdvancedRule] = try encrypted.advancedRules.map {
+			let decryptedType: String = try decrypt(base64: $0.ruleType, key: sessionKey)
+			let type = try ByRuleType(value: decryptedType)
+
+			let interval: String = try decrypt(base64: $0.interval, key: sessionKey)
+			return AdvancedRule(ruleType: type, interval: interval)
+		}
+		self.advancedRules = advancedRules
 	}
 }

app-ios/TutanotaSharedFramework/Notifications/EncryptedRepeatRule.swift

@@ -1,4 +1,5 @@
 import Foundation
+import tutasdk
 
 public enum RepeatPeriod: Int, SimpleStringDecodable {
 	case daily = 0
@@ -29,7 +30,60 @@ public enum RepeatEndCondition: Equatable {
 	}
 }
 
+public enum ByRuleType: String, Codable, Equatable, SimpleStringDecodable {
+	case byminute
+	case byhour
+	case byday
+	case bymonthday
+	case byyearday
+	case byweekno
+	case bymonth
+	case bysetpos
+	case wkst
+
+	public init(value: String) throws {
+		switch value {
+		case "0": self = .byminute
+		case "1": self = .byhour
+		case "2": self = .byday
+		case "3": self = .bymonthday
+		case "4": self = .byyearday
+		case "5": self = .byweekno
+		case "6": self = .bymonth
+		case "7": self = .bysetpos
+		case "8": self = .wkst
+		default: throw TUTErrorFactory.createError("Invalid ByRuleType")
+		}
+	}
+}
+
 public struct EncryptedDateWrapper: Codable, Hashable { public let date: Base64 }
+public struct EncryptedAdvancedRuleWrapper: Codable, Hashable {
+	public let ruleType: String
+	public let interval: String
+}
+public struct AdvancedRule: Codable, Hashable {
+	public let ruleType: ByRuleType
+	public let interval: String
+
+	public func toSDKRule() -> ByRule { ByRule(byRule: self.ruleType.toSDKType(), interval: self.interval) }
+}
+
+extension ByRuleType {
+	func toSDKType() -> tutasdk.ByRuleType {
+		switch self {
+		case .byminute: return tutasdk.ByRuleType.byminute
+		case .byhour: return tutasdk.ByRuleType.byhour
+		case .byday: return tutasdk.ByRuleType.byday
+		case .bymonth: return tutasdk.ByRuleType.bymonth
+		case .bymonthday: return tutasdk.ByRuleType.bymonthday
+		case .byyearday: return tutasdk.ByRuleType.byyearday
+		case .byweekno: return tutasdk.ByRuleType.byweekno
+		case .bysetpos: return tutasdk.ByRuleType.bysetpos
+		case .wkst: return tutasdk.ByRuleType.wkst
+		}
+	}
+}
 
 public struct EncryptedRepeatRule: Codable, Hashable {
 	public let frequency: Base64
@@ -38,6 +92,7 @@ public struct EncryptedRepeatRule: Codable, Hashable {
 	public let endType: Base64
 	public let endValue: Base64?
 	public let excludedDates: [EncryptedDateWrapper]
+	public let advancedRules: [EncryptedAdvancedRuleWrapper]
 
 	public init(from decoder: Decoder) throws {
 		let container = try decoder.container(keyedBy: CodingKeys.self)
@@ -47,6 +102,12 @@ public struct EncryptedRepeatRule: Codable, Hashable {
 			self.excludedDates = [EncryptedDateWrapper]()
 		}
 
+		if let advancedRules = try container.decodeIfPresent([EncryptedAdvancedRuleWrapper].self, forKey: .advancedRules) {
+			self.advancedRules = advancedRules
+		} else {
+			self.advancedRules = [EncryptedAdvancedRuleWrapper]()
+		}
+
 		self.frequency = try container.decode(Base64.self, forKey: .frequency)
 		self.interval = try container.decode(Base64.self, forKey: .interval)
 		self.timeZone = try container.decode(Base64.self, forKey: .timeZone)

app-ios/TutanotaSharedFramework/Utils/Utils.swift

@@ -5,12 +5,12 @@ public func translate(_ key: String, default defaultValue: String) -> String {
 }
 
 // // keep in sync with src/native/main/NativePushServiceApp.ts
-let SYS_MODEL_VERSION = 99
+let SYS_MODEL_VERSION = 118
 
 // api/entities/tutanota/ModelInfo.ts
 // FIXME there are at least 5 places needs manual sync for these version numbers.
 // Definitely need a script to automate.
-public let TUTANOTA_MODEL_VERSION: UInt32 = 71
+public let TUTANOTA_MODEL_VERSION: UInt32 = 80
 
 public func addSystemModelHeaders(to headers: inout [String: String]) { headers["v"] = String(SYS_MODEL_VERSION) }
 public func addTutanotaModelHeaders(to headers: inout [String: String]) { headers["v"] = String(TUTANOTA_MODEL_VERSION) }