chore: Reduce warnings (#1543)

Infomaniak · Sep 18, 2024 · ed4ed1f · ed4ed1f
2 parents af96ae5 + 8903dc7
commit ed4ed1f
Show file tree

Hide file tree

Showing 43 changed files with 100 additions and 87 deletions.
diff --git a/Mail/Components/ThreadCell/ThreadCell.swift b/Mail/Components/ThreadCell/ThreadCell.swift
@@ -54,6 +54,7 @@ struct ThreadCellDataHolder {
     let isInWrittenByMeFolder: Bool
 
     init(thread: Thread) {
+        // swiftlint:disable:next last_where
         let lastMessageNotFromSent = thread.messages.filter(Self.lastMessageNotFromSentPredicate).last ?? thread.messages.last
 
         date = thread.date.formatted(.thread(.list))

diff --git a/Mail/Views/AI Writer/Proposition/AIDismissibleErrorView.swift b/Mail/Views/AI Writer/Proposition/AIDismissibleErrorView.swift
@@ -36,14 +36,15 @@ struct AIDismissibleErrorView: View {
                 InformationBlockView(
                     icon: MailResourcesAsset.warningFill.swiftUIImage,
                     message: error?.localizedDescription ?? "",
-                    iconColor: MailResourcesAsset.orangeColor.swiftUIColor
-                ) {
-                    matomo.track(eventWithCategory: .aiWriter, name: "dismissError")
+                    iconColor: MailResourcesAsset.orangeColor.swiftUIColor,
+                    dismissHandler: { // swiftlint:disable:this trailing_closure
+                        matomo.track(eventWithCategory: .aiWriter, name: "dismissError")
 
-                    withAnimation {
-                        isShowingError = false
+                        withAnimation {
+                            isShowingError = false
+                        }
                     }
-                }
+                )
             }
         }
         .onChange(of: error) { newError in

diff --git a/Mail/Views/Bottom sheets/Actions/HeaderCloseButtonView.swift b/Mail/Views/Bottom sheets/Actions/HeaderCloseButtonView.swift
@@ -39,7 +39,7 @@ struct HeaderCloseButtonView: View {
     }
 }
 
-#Preview {
+@available(iOS 17.0, *)
+#Preview(traits: .sizeThatFitsLayout) {
     HeaderCloseButtonView(title: "View") {}
-        .previewLayout(.sizeThatFits)
 }
diff --git a/Mail/Views/Menu Drawer/Actions/HelpView.swift b/Mail/Views/Menu Drawer/Actions/HelpView.swift
@@ -87,6 +87,7 @@ struct HelpView: View {
         .background(MailResourcesAsset.backgroundColor.swiftUIColor)
         .navigationBarTitle(MailResourcesStrings.Localizable.buttonHelp, displayMode: .inline)
         .customAlert(item: $updateVersionAlert) { action in
+            // swiftlint:disable:next trailing_closure
             UpdateVersionAlertView(onLaterPressed: {
                 openURL(action.destination)
             })

diff --git a/Mail/Views/Menu Drawer/Folders/FolderCell.swift b/Mail/Views/Menu Drawer/Folders/FolderCell.swift
@@ -26,7 +26,7 @@ import SwiftUI
 import SwiftUIMacros
 
 extension EnvironmentValues {
-    @EnvironmentValue
+    @EnvironmentKey
     var folderCellType = FolderCell.CellType.menuDrawer
 }
 

diff --git a/Mail/Views/Menu Drawer/MailboxManagement/MailboxCell.swift b/Mail/Views/Menu Drawer/MailboxManagement/MailboxCell.swift
@@ -27,7 +27,7 @@ import SwiftUI
 import SwiftUIMacros
 
 extension EnvironmentValues {
-    @EnvironmentValue
+    @EnvironmentKey
     var mailboxCellStyle = MailboxCell.Style.menuDrawer
 }
 

diff --git a/Mail/Views/Settings/Data & Privacy/SettingsAccountManagementView.swift b/Mail/Views/Settings/Data & Privacy/SettingsAccountManagementView.swift
@@ -105,7 +105,7 @@ struct SettingsAccountManagementView: View {
     }
 }
 
-extension ApiToken: Identifiable {
+extension ApiToken: @retroactive Identifiable {
     public var id: String {
         return "\(userId)\(accessToken)"
     }

diff --git a/Mail/Views/Settings/General/SettingsNotificationsView.swift b/Mail/Views/Settings/General/SettingsNotificationsView.swift
@@ -113,6 +113,7 @@ struct SettingsNotificationsView: View {
                 }
             }
         }
+        // swiftlint:disable:next trailing_closure
         .sceneLifecycle(willEnterForeground: {
             settingsNotificationEnabled { enabled in
                 showWarning = !enabled

diff --git a/Mail/Views/SplitView.swift b/Mail/Views/SplitView.swift
@@ -153,6 +153,7 @@ struct SplitView: View {
             SafariWebView(url: safariContent.url)
                 .ignoresSafeArea()
         }
+        // swiftlint:disable:next trailing_closure
         .sceneLifecycle(willEnterForeground: {
             Task {
                 // We need to write in Task instead of async let to avoid being cancelled to early

diff --git a/Mail/Views/Sync Profile/SyncInstallProfileTutorialView.swift b/Mail/Views/Sync Profile/SyncInstallProfileTutorialView.swift
@@ -24,7 +24,7 @@ import MailCoreUI
 import MailResources
 import SwiftUI
 
-extension MailResourcesImages: Identifiable {
+extension MailResourcesImages: @retroactive Identifiable {
     public var id: String {
         name
     }

diff --git a/Mail/Views/Thread List/ThreadListCell.swift b/Mail/Views/Thread List/ThreadListCell.swift
@@ -65,15 +65,14 @@ struct ThreadListCell: View {
             density: threadDensity,
             accentColor: accentColor,
             isMultipleSelectionEnabled: multipleSelectionViewModel.isEnabled,
-            isSelected: isMultiSelected,
-            avatarTapped: {
-                if multipleSelectionViewModel.isEnabled {
-                    didTapCell()
-                } else {
-                    didOptionalTapCell()
-                }
+            isSelected: isMultiSelected
+        ) {
+            if multipleSelectionViewModel.isEnabled {
+                didTapCell()
+            } else {
+                didOptionalTapCell()
             }
-        )
+        }
         .background(SelectionBackground(
             selectionType: selectionType,
             paddingLeading: 4,

diff --git a/Mail/Views/Thread List/ThreadListView.swift b/Mail/Views/Thread List/ThreadListView.swift
@@ -197,6 +197,7 @@ struct ThreadListView: View {
         .onChange(of: multipleSelectionViewModel.isEnabled) { isEnabled in
             scrollObserver.shouldObserve = !isEnabled
         }
+        // swiftlint:disable:next trailing_closure
         .sceneLifecycle(willEnterForeground: {
             updateFetchingTask()
         })
@@ -210,6 +211,7 @@ struct ThreadListView: View {
             FlushFolderAlertView(flushAlert: item, folder: viewModel.frozenFolder)
         }
         .customAlert(isPresented: $isShowingUpdateAlert) {
+            // swiftlint:disable:next trailing_closure
             UpdateVersionAlertView(onDismiss: {
                 hasDismissedUpdateVersionView = true
             })

diff --git a/Mail/Views/Thread/Message/InlineAttachmentWorker.swift b/Mail/Views/Thread/Message/InlineAttachmentWorker.swift
@@ -66,8 +66,10 @@ final class InlineAttachmentWorker: ObservableObject {
 
         self.mailboxManager = mailboxManager
         processing = Task { [weak self] in
-            guard let message = mailboxManager.transactionExecutor.fetchObject(ofType: Message.self, forPrimaryKey: messageUid)?
-                .freeze() else {
+            guard let message = mailboxManager.transactionExecutor.fetchObject(
+                ofType: Message.self,
+                forPrimaryKey: self?.messageUid
+            )?.freeze() else {
                 return
             }
 

diff --git a/Mail/Views/Thread/Message/MessageBodyView.swift b/Mail/Views/Thread/Message/MessageBodyView.swift
@@ -65,15 +65,17 @@ struct MessageBodyView: View {
                     }
 
                     if !presentableBody.quotes.isEmpty {
-                        Button(model.showBlockQuote
-                            ? MailResourcesStrings.Localizable.messageHideQuotedText
-                            : MailResourcesStrings.Localizable.messageShowQuotedText) {
-                                model.showBlockQuote.toggle()
-                            }
-                            .buttonStyle(.ikBorderless(isInlined: true))
-                            .controlSize(.small)
-                            .frame(maxWidth: .infinity, alignment: .leading)
-                            .padding(.horizontal, value: .medium)
+                        Button(
+                            model.showBlockQuote
+                                ? MailResourcesStrings.Localizable.messageHideQuotedText
+                                : MailResourcesStrings.Localizable.messageShowQuotedText
+                        ) {
+                            model.showBlockQuote.toggle()
+                        }
+                        .buttonStyle(.ikBorderless(isInlined: true))
+                        .controlSize(.small)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                        .padding(.horizontal, value: .medium)
                     }
                 }
             }

diff --git a/Mail/Views/Thread/Message/MessageHeader/MessageHeaderSummaryView.swift b/Mail/Views/Thread/Message/MessageHeader/MessageHeaderSummaryView.swift
@@ -154,22 +154,22 @@ struct MessageHeaderSummaryView: View {
     }
 }
 
-#Preview("Message collapsed") {
-    MessageHeaderSummaryView(message: PreviewHelper.sampleMessage,
-                             isMessageExpanded: .constant(false),
-                             isHeaderExpanded: .constant(false)) {
-        // Preview
-    }
-    .environmentObject(PreviewHelper.sampleMailboxManager)
-    .previewLayout(.sizeThatFits)
+@available(iOS 17.0, *)
+#Preview("Message collapsed", traits: .sizeThatFitsLayout) {
+    MessageHeaderSummaryView(
+        message: PreviewHelper.sampleMessage,
+        isMessageExpanded: .constant(false),
+        isHeaderExpanded: .constant(false)
+    ) {}
+        .environmentObject(PreviewHelper.sampleMailboxManager)
 }
 
-#Preview("Message expanded") {
-    MessageHeaderSummaryView(message: PreviewHelper.sampleMessage,
-                             isMessageExpanded: .constant(true),
-                             isHeaderExpanded: .constant(false)) {
-        // Preview
-    }
-    .environmentObject(PreviewHelper.sampleMailboxManager)
-    .previewLayout(.sizeThatFits)
+@available(iOS 17.0, *)
+#Preview("Message expanded", traits: .sizeThatFitsLayout) {
+    MessageHeaderSummaryView(
+        message: PreviewHelper.sampleMessage,
+        isMessageExpanded: .constant(true),
+        isHeaderExpanded: .constant(false)
+    ) {}
+        .environmentObject(PreviewHelper.sampleMailboxManager)
 }
diff --git a/Mail/Views/Thread/Message/MessageView.swift b/Mail/Views/Thread/Message/MessageView.swift
@@ -170,20 +170,20 @@ extension MessageView {
     }
 }
 
-#Preview("Message collapsed") {
+@available(iOS 17.0, *)
+#Preview("Message collapsed", traits: .sizeThatFitsLayout) {
     MessageView(
         message: PreviewHelper.sampleMessage,
         threadForcedExpansion: .constant([PreviewHelper.sampleMessage.uid: .collapsed])
     )
     .environmentObject(PreviewHelper.sampleMailboxManager)
-    .previewLayout(.sizeThatFits)
 }
 
-#Preview("Message expanded") {
+@available(iOS 17.0, *)
+#Preview("Message expanded", traits: .sizeThatFitsLayout) {
     MessageView(
         message: PreviewHelper.sampleMessage,
         threadForcedExpansion: .constant([PreviewHelper.sampleMessage.uid: .expanded])
     )
     .environmentObject(PreviewHelper.sampleMailboxManager)
-    .previewLayout(.sizeThatFits)
 }
diff --git a/Mail/Views/Thread/SuperCollapsedView.swift b/Mail/Views/Thread/SuperCollapsedView.swift
@@ -49,5 +49,5 @@ struct SuperCollapsedView: View {
 }
 
 #Preview {
-    SuperCollapsedView(count: 5, action: {})
+    SuperCollapsedView(count: 5) {}
 }
diff --git a/MailCore/API/MailApiFetcher/MailApiFetcher.swift b/MailCore/API/MailApiFetcher/MailApiFetcher.swift
@@ -59,9 +59,8 @@ public final class MailApiFetcher: ApiFetcher, MailApiFetchable {
                 if case .responseSerializationFailed(let reason) = afError, case .decodingFailed(let error) = reason,
                    let statusCode = request.response?.statusCode, (200 ... 299).contains(statusCode) {
                     var rawJson = "No data"
-                    if let data = request.data,
-                       let stringData = String(data: data, encoding: .utf8) {
-                        rawJson = stringData
+                    if let data = request.data {
+                        rawJson = String(decoding: data, as: UTF8.self)
                     }
 
                     SentrySDK.capture(error: error) { scope in

diff --git a/MailCore/API/MailError.swift b/MailCore/API/MailError.swift
@@ -21,7 +21,7 @@ import Foundation
 import InfomaniakCore
 import MailResources
 
-extension ApiError: CustomStringConvertible {}
+extension ApiError: @retroactive CustomStringConvertible {}
 
 public class AFErrorWithContext: MailError, CustomStringConvertible {
     public let request: DataRequest

diff --git a/MailCore/Cache/Actions/Action+List.swift b/MailCore/Cache/Actions/Action+List.swift
@@ -86,7 +86,7 @@ extension Action: CaseIterable {
         let star = message.flagged
         let spam = message.folder?.role == .spam
         let print = origin.type == .floatingPanel(source: .messageList)
-        var tempListActions: [Action?] = [
+        let tempListActions: [Action?] = [
             .openMovePanel,
             spam ? .nonSpam : .reportJunk,
             unread ? .markAsRead : .markAsUnread,

diff --git a/MailCore/Cache/Actions/ActionsManager.swift b/MailCore/Cache/Actions/ActionsManager.swift
@@ -24,7 +24,7 @@ import MailResources
 import Sentry
 import SwiftUI
 
-extension [Message]: Identifiable {
+extension [Message]: @retroactive Identifiable {
     public var id: Int {
         var hasher = Hasher()
         forEach { hasher.combine($0.hashValue) }

diff --git a/MailCore/Cache/DraftManager.swift b/MailCore/Cache/DraftManager.swift
@@ -40,7 +40,7 @@ actor DraftQueue {
     func beginBackgroundTask(withName name: String, for uuid: String) async {
         let identifier = await UIApplication.shared.beginBackgroundTask(withName: name) { [self] in
             Task {
-                endBackgroundTask(uuid: uuid)
+                await endBackgroundTask(uuid: uuid)
             }
         }
         identifierQueue[uuid] = identifier

diff --git a/MailCore/Cache/MailboxManager/MailboxManageable.swift b/MailCore/Cache/MailboxManager/MailboxManageable.swift
@@ -107,4 +107,4 @@ public protocol MailboxManagerAttachable {
     func swissTransferAttachment(message: Message) async throws
 }
 
-// TODO: write a dedicated protocol for each MailboxManager+<>
+// TODO: write a dedicated protocol for each MailboxManager
diff --git a/MailCore/Cache/MailboxManager/MailboxManager+Folders.swift b/MailCore/Cache/MailboxManager/MailboxManager+Folders.swift
@@ -87,7 +87,7 @@ public extension MailboxManager {
     }
 
     func createFolder(name: String, parent: Folder?) async throws -> Folder {
-        var folder = try await apiFetcher.create(mailbox: mailbox, folder: NewFolder(name: name, path: parent?.path))
+        let folder = try await apiFetcher.create(mailbox: mailbox, folder: NewFolder(name: name, path: parent?.path))
         try writeTransaction { writableRealm in
             writableRealm.add(folder)
             if let parent {

diff --git a/MailCore/Utils/ContentRuleGenerator.swift b/MailCore/Utils/ContentRuleGenerator.swift
@@ -58,6 +58,6 @@ public enum ContentRuleGenerator {
 
     public static func generateContentRulesJSON(rules: [ContentRule]) -> String? {
         guard let encodedData = try? jsonEncoder.encode(rules) else { return nil }
-        return String(data: encodedData, encoding: .utf8)
+        return String(decoding: encodedData, as: UTF8.self)
     }
 }
diff --git a/MailCore/Utils/LocalContactsHelper.swift b/MailCore/Utils/LocalContactsHelper.swift
@@ -74,7 +74,7 @@ public final class LocalContactsHelper: LocalContactsHelpable {
 
     private func checkAuthorization() async throws {
         switch CNContactStore.authorizationStatus(for: .contacts) {
-        case .authorized:
+        case .authorized, .limited:
             // All ok
             return
         case .restricted, .denied:

diff --git a/MailCore/Utils/MessageBodyUtils.swift b/MailCore/Utils/MessageBodyUtils.swift
@@ -18,7 +18,6 @@
 
 import CocoaLumberjackSwift
 import Foundation
-import MailCore
 import MailResources
 import SwiftSoup
 

diff --git a/MailCoreUI/Components/InformationBlockView.swift b/MailCoreUI/Components/InformationBlockView.swift
@@ -116,9 +116,9 @@ public struct InformationBlockView: View {
         message: "Tip",
         iconColor: .blue,
         buttonAction: {},
-        buttonTitle: "Button title"
-    ) {
-    /* Preview */ }
+        buttonTitle: "Button title",
+        dismissHandler: {} // swiftlint:disable:this trailing_closure
+    )
 }
 
 #Preview("Without Title") {

diff --git a/MailCoreUI/Extensions/Environment+Extension.swift b/MailCoreUI/Extensions/Environment+Extension.swift
@@ -21,6 +21,6 @@ import SwiftUI
 import SwiftUIMacros
 
 public extension EnvironmentValues {
-    @EnvironmentValue
+    @EnvironmentKey
     var isCompactWindow = true
 }
diff --git a/MailCoreUI/ViewModifier/SheetViewModifier.swift b/MailCoreUI/ViewModifier/SheetViewModifier.swift
@@ -24,7 +24,7 @@ import SwiftUIMacros
 public typealias DismissModalAction = () -> Void
 
 public extension EnvironmentValues {
-    @EnvironmentValue
+    @EnvironmentKey
     var dismissModal: DismissModalAction = { /* dismiss nothing by default */ }
 }
 

diff --git a/MailShareExtension/ComposeMessageWrapperView.swift b/MailShareExtension/ComposeMessageWrapperView.swift
@@ -28,6 +28,7 @@ import MobileCoreServices
 import Social
 import SwiftUI
 import UIKit
+import UniformTypeIdentifiers
 import VersionChecker
 
 struct ComposeMessageWrapperView: View {
@@ -39,7 +40,7 @@ struct ComposeMessageWrapperView: View {
     let itemProviders: [NSItemProvider]
     let dismissHandler: SimpleClosure
 
-    static let typePropertyList = String(kUTTypePropertyList)
+    static let typePropertyList = UTType.propertyList.identifier
 
     /// All the Attachments that should directly provide URLs and title for a new Email Draft
     var htmlAttachments: [HTMLAttachable] {

diff --git a/MailTests/Contacts/UTContactManager.swift b/MailTests/Contacts/UTContactManager.swift
@@ -22,7 +22,7 @@ import XCTest
 final class UTContactManager: XCTestCase {
     let contactManager = ContactManager(userId: 0, apiFetcher: MailApiFetcher())
 
-    override class func setUp() {
+    override static func setUp() {
         super.setUp()
 
         MockingHelper.clearRegisteredTypes()