Skip to content

Commit c90e57e

Browse files
chore: Remove Realm migration
1 parent 6ec8fdd commit c90e57e

File tree

3 files changed

+9
-22
lines changed

3 files changed

+9
-22
lines changed

MailCore/Cache/MailboxManager/MailboxManager+Thread.swift

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -529,9 +529,9 @@ public extension MailboxManager {
529529
partial.where { thread in
530530
let isInFolder = thread.folderId == folder.remoteId
531531
let isSnoozed = thread.snoozeState == .snoozed && thread.snoozeUuid != nil && thread.snoozeEndDate != nil
532-
let isLastMessageFromThreadNotSnoozed = !thread.isLastMessageFromFolderSnoozed
532+
let isLastMessageFromFolderNotSnoozed = !thread.isLastMessageFromFolderSnoozed
533533

534-
return isInFolder && isSnoozed && isLastMessageFromThreadNotSnoozed
534+
return isInFolder && isSnoozed && isLastMessageFromFolderNotSnoozed
535535
}
536536
}.freeze()
537537

@@ -540,7 +540,10 @@ public extension MailboxManager {
540540
let unsnoozedMessages: [String] = await Array(frozenThreadsToUnsnooze).concurrentCompactMap(
541541
customConcurrency: Self.maxParallelUnsnooze
542542
) { thread in
543-
guard let lastMessageSnoozed = thread.messages.last(where: { $0.isSnoozed }) else { return nil }
543+
guard let lastMessageSnoozed = thread.messages.last(where: { $0.isSnoozed }),
544+
thread.lastMessageFromFolder?.isSnoozed == false else {
545+
return nil
546+
}
544547

545548
do {
546549
try await self.apiFetcher.deleteSnooze(message: lastMessageSnoozed, mailbox: self.mailbox)

MailCore/Cache/MailboxManager/MailboxManager.swift

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,22 +118,6 @@ public final class MailboxManager: ObservableObject, MailboxManageable {
118118
}
119119
}
120120
}
121-
if oldSchemaVersion < 40 {
122-
migration.enumerateObjects(ofType: Thread.className()) { _, newObject in
123-
if let messages = newObject?["messages"] as? List<MigrationObject>,
124-
let lastMessageFromFolder = messages.last(where: {
125-
$0["folderId"] as? String == newObject?["folderId"] as? String
126-
}) {
127-
let snoozeState = lastMessageFromFolder["snoozeState"] as? String?
128-
let snoozeEndDate = lastMessageFromFolder["snoozeEndDate"] as? Date?
129-
let snoozeUuid = lastMessageFromFolder["snoozeUuid"] as? String?
130-
let isSnoozed = snoozeState == SnoozeState.snoozed
131-
.rawValue && snoozeEndDate != nil && snoozeUuid != nil
132-
133-
newObject?["isLastMessageFromFolderSnoozed"] = isSnoozed
134-
}
135-
}
136-
}
137121
},
138122
objectTypes: [
139123
Folder.self,

MailCore/Utils/SentryDebug.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ public enum SentryDebug {
101101
}
102102

103103
public static func captureManuallyUnsnoozeError(error: Error) {
104-
SentrySDK.capture(message: "Impossible to automatically unsnooze thread") { scope in
104+
SentrySDK.capture(message: "Impossible to manually unsnooze thread") { scope in
105105
scope.setLevel(.error)
106-
let errorCore = (error as? MailError)?.code ?? "NA"
107-
scope.setExtra(value: errorCore, key: "MailError")
106+
let errorCode = (error as? MailError)?.code ?? "NA"
107+
scope.setExtra(value: errorCode, key: "MailError")
108108
scope.setContext(
109109
value: [
110110
"Error": error,

0 commit comments

Comments
 (0)