From 747e2a5abcbfc05e4951bad9bc8dcd66d9851769 Mon Sep 17 00:00:00 2001 From: Ambroise Decouttere Date: Fri, 12 Apr 2024 13:45:59 +0200 Subject: [PATCH 1/2] fix: Remove useless Sentry import --- Mail/MailApp.swift | 1 - Mail/UserAccountScene.swift | 1 - MailCore/Cache/MailboxInfosManager.swift | 1 - MailCore/Models/Thread.swift | 1 - 4 files changed, 4 deletions(-) diff --git a/Mail/MailApp.swift b/Mail/MailApp.swift index ebc391650..3ca3ec243 100644 --- a/Mail/MailApp.swift +++ b/Mail/MailApp.swift @@ -26,7 +26,6 @@ import InfomaniakLogin import InfomaniakNotifications import MailCore import MailResources -import Sentry import SwiftUI import UIKit diff --git a/Mail/UserAccountScene.swift b/Mail/UserAccountScene.swift index c83adaaaf..82e21ae80 100644 --- a/Mail/UserAccountScene.swift +++ b/Mail/UserAccountScene.swift @@ -26,7 +26,6 @@ import InfomaniakLogin import InfomaniakNotifications import MailCore import MailResources -import Sentry import SwiftUI import UIKit import VersionChecker diff --git a/MailCore/Cache/MailboxInfosManager.swift b/MailCore/Cache/MailboxInfosManager.swift index 4507eae08..4325d06a4 100644 --- a/MailCore/Cache/MailboxInfosManager.swift +++ b/MailCore/Cache/MailboxInfosManager.swift @@ -20,7 +20,6 @@ import Foundation import InfomaniakCore import Realm import RealmSwift -import Sentry /// Conforming to `RealmAccessible` to get a standard `.getRealm` function extension MailboxInfosManager: RealmAccessible {} diff --git a/MailCore/Models/Thread.swift b/MailCore/Models/Thread.swift index f3ceb30a6..446aa2f25 100644 --- a/MailCore/Models/Thread.swift +++ b/MailCore/Models/Thread.swift @@ -19,7 +19,6 @@ import Foundation import MailResources import RealmSwift -import Sentry public struct ThreadResult: Decodable { public let threads: [Thread]? From 345fb77d9ac4db82bc8a8ec869d669d26cb67979 Mon Sep 17 00:00:00 2001 From: Ambroise Decouttere Date: Fri, 12 Apr 2024 14:37:39 +0200 Subject: [PATCH 2/2] fix: Remove confidential data from Sentry --- .../Cache/MailboxManager/MailboxManager+Thread.swift | 2 +- MailCore/Utils/SentryDebug.swift | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/MailCore/Cache/MailboxManager/MailboxManager+Thread.swift b/MailCore/Cache/MailboxManager/MailboxManager+Thread.swift index 2a9536326..ab020491a 100644 --- a/MailCore/Cache/MailboxManager/MailboxManager+Thread.swift +++ b/MailCore/Cache/MailboxManager/MailboxManager+Thread.swift @@ -456,7 +456,7 @@ public extension MailboxManager { scope.setContext(value: ["Message": ["uid": message.uid, "messageId": message.messageId], "Folder": ["id": message.folder?.remoteId, - "name": message.folder?.name, + "name": message.folder?.matomoName, "cursor": message.folder?.cursor]], key: "Message context") } diff --git a/MailCore/Utils/SentryDebug.swift b/MailCore/Utils/SentryDebug.swift index 32a35e9f7..7c2d308d5 100644 --- a/MailCore/Utils/SentryDebug.swift +++ b/MailCore/Utils/SentryDebug.swift @@ -111,11 +111,10 @@ public enum SentryDebug { scope.setContext(value: ["threads": Array(threads).map { [ "uid": "\($0.uid)", - "subject": $0.subject ?? "No subject", "messageIds": "\($0.messageIds.joined(separator: ","))", "lastMessageFromFolder": $0.lastMessageFromFolder?.uid ?? "nil", "messages": Array($0.messages) - .map { ["message uid": $0.uid, "message subject": $0.subject ?? "No subject", "message date": $0.date] } + .map { ["message uid": $0.uid, "message date": $0.date] } ] }], key: "threads") @@ -207,7 +206,7 @@ public enum SentryDebug { "references": message.references ?? "nil"], "Seen": ["Expected": actualSeen, "Actual": liveMessage.seen], "Folder": ["id": message.folder?.remoteId ?? "nil", - "name": message.folder?.name ?? "nil", + "name": message.folder?.matomoName ?? "nil", "last update": message.folder?.lastUpdate, "cursor": message.folder?.cursor ?? "nil"]], key: "Message context") @@ -237,7 +236,7 @@ public enum SentryDebug { static func addBackoffBreadcrumb(folder: Folder, index: Int) { let breadcrumb = Breadcrumb() - breadcrumb.message = "Backoff \(index) for folder \(folder.name) - \(folder.remoteId)" + breadcrumb.message = "Backoff \(index) for folder \(folder.matomoName) - \(folder.remoteId)" breadcrumb.level = .warning breadcrumb.type = "debug" SentrySDK.addBreadcrumb(breadcrumb) @@ -245,7 +244,7 @@ public enum SentryDebug { static func addResetingFolderBreadcrumb(folder: Folder) { let breadcrumb = Breadcrumb() - breadcrumb.message = "Reseting folder after failed backoff \(folder.name) - \(folder.remoteId)" + breadcrumb.message = "Reseting folder after failed backoff \(folder.matomoName) - \(folder.remoteId)" breadcrumb.level = .warning breadcrumb.type = "debug" SentrySDK.addBreadcrumb(breadcrumb) @@ -253,7 +252,7 @@ public enum SentryDebug { static func failedResetingAfterBackoff(folder: Folder) { SentrySDK.capture(message: "Failed reseting folder after backoff") { scope in - scope.setContext(value: ["Folder": ["Id": folder.id, "name": folder.name]], + scope.setContext(value: ["Folder": ["Id": folder.id, "name": folder.matomoName]], key: "Folder context") } }