fix: Improve offline error handling

Mail/Utils/NetworkMonitor.swift

@@ -26,6 +26,10 @@ class NetworkMonitor: ObservableObject {
     private var monitor: NWPathMonitor?
     private let queue = DispatchQueue.global()
 
+    public static let shared = NetworkMonitor()
+
+    private init() {}
+
     public func start() {
         if monitor == nil {
             monitor = NWPathMonitor()

Mail/Views/Thread List/ThreadListSwipeAction.swift

@@ -28,14 +28,16 @@ private struct SwipeActionView: View {
 
     @EnvironmentObject private var actionsManager: ActionsManager
 
+    @ObservedObject private var networkMonitor = NetworkMonitor.shared
+
     @Binding var actionPanelMessages: [Message]?
     @Binding var moveSheetMessages: [Message]?
 
     let thread: Thread
     let action: Action
 
     var body: some View {
-        Button(role: action.isDestructive ? .destructive : nil) {
+        Button(role: action.isDestructive && networkMonitor.isConnected ? .destructive : nil) {
             matomo.track(eventWithCategory: .swipeActions, action: .drag, name: action.matomoName)
             Task {
                 await tryOrDisplayError {

Mail/Views/Thread List/ThreadListView.swift

@@ -42,7 +42,7 @@ struct ThreadListView: View {
 
     @StateObject var viewModel: ThreadListViewModel
     @StateObject var multipleSelectionViewModel: ThreadListMultipleSelectionViewModel
-    @StateObject private var networkMonitor = NetworkMonitor()
+    @ObservedObject private var networkMonitor = NetworkMonitor.shared
 
     private var shouldDisplayEmptyView: Bool {
         viewModel.folder.lastUpdate != nil && viewModel.sections.isEmpty && !viewModel.isLoadingPage

Mail/Views/Thread/MoveEmailView.swift

@@ -87,7 +87,9 @@ struct MoveEmailView: View {
     private func move(to folder: Folder) {
         let frozenOriginFolder = originFolder?.freezeIfNeeded()
         Task {
-            try await actionsManager.performMove(messages: movedMessages, from: frozenOriginFolder, to: folder)
+            await tryOrDisplayError {
+                try await actionsManager.performMove(messages: movedMessages, from: frozenOriginFolder, to: folder)
+            }
         }
         dismissModal()
     }

Mail/Views/Thread/ThreadView.swift

@@ -69,7 +69,10 @@ struct ThreadView: View {
                         .multilineTextAlignment(.leading)
                         .lineSpacing(8)
 
-                    let externalTag = thread.displayExternalRecipientState(mailboxManager: mailboxManager, recipientsList: thread.from)
+                    let externalTag = thread.displayExternalRecipientState(
+                        mailboxManager: mailboxManager,
+                        recipientsList: thread.from
+                    )
                     switch externalTag {
                     case .many, .one:
                         Button {
@@ -121,11 +124,13 @@ struct ThreadView: View {
                     let messages = thread.messages.freeze().toArray()
                     let originFolder = thread.folder?.freezeIfNeeded()
                     Task {
-                        try await actionsManager.performAction(
-                            target: messages,
-                            action: thread.flagged ? .unstar : .star,
-                            origin: .toolbar(originFolder: originFolder)
-                        )
+                        await tryOrDisplayError {
+                            try await actionsManager.performAction(
+                                target: messages,
+                                action: thread.flagged ? .unstar : .star,
+                                origin: .toolbar(originFolder: originFolder)
+                            )
+                        }
                     }
                 } label: {
                     (thread.flagged ? MailResourcesAsset.starFull : MailResourcesAsset.star).swiftUIImage
@@ -177,7 +182,7 @@ struct ThreadView: View {
 
     private func markThreadAsReadIfNeeded(thread: Thread) async {
         guard thread.hasUnseenMessages else { return }
-        
+
         let originFolder = thread.folder?.freezeIfNeeded()
         try? await actionsManager.performAction(
             target: thread.messages.toArray(),
@@ -200,13 +205,15 @@ struct ThreadView: View {
 
         let originFolder = thread.folder?.freezeIfNeeded()
         Task {
-            try await actionsManager.performAction(
-                target: messages,
-                action: action,
-                origin: .toolbar(originFolder: originFolder)
-            )
-            if action == .archive || action == .delete {
-                dismiss()
+            await tryOrDisplayError {
+                try await actionsManager.performAction(
+                    target: messages,
+                    action: action,
+                    origin: .toolbar(originFolder: originFolder)
+                )
+                if action == .archive || action == .delete {
+                    dismiss()
+                }
             }
         }
     }

MailCore/API/MailApiFetcher/MailApiFetcher.swift

@@ -71,7 +71,15 @@ public final class MailApiFetcher: ApiFetcher, MailApiFetchable {
                                          "Decoded type": String(describing: T.self),
                                          "Raw JSON": rawJson])
                     }
+                } else if case .sessionTaskFailed(let error) = afError,
+                          (error as NSError).code == NSURLErrorNotConnectedToInternet {
+                    throw MailError.noConnection
+
+                } else if case .requestAdaptationFailed(let error) = afError,
+                          (error as NSError).code == NSURLErrorNotConnectedToInternet {
+                    throw MailError.noConnection
                 }
+
                 throw AFErrorWithContext(request: request, afError: afError)
             } else {
                 throw error

MailCore/API/MailError.swift

@@ -71,6 +71,10 @@ public class MailError: LocalizedError {
                                                               shouldDisplay: true)
     public static let incoherentThreadDate = MailError(code: "incoherentThreadDate")
 
+    public static let noConnection = MailError(code: "noConnection",
+                                               localizedDescription: MailResourcesStrings.Localizable.noConnection,
+                                               shouldDisplay: true)
+
     /// After an update from the server we are still without a default signature
     public static let defaultSignatureMissing = MailError(code: "defaultSignatureMissing")
 

MailCore/API/SyncedAuthenticator.swift

@@ -31,7 +31,7 @@ final class SyncedAuthenticator: OAuthAuthenticator {
             SentrySDK
                 .addBreadcrumb(oldToken.generateBreadcrumb(level: .error,
                                                            message: "Refreshing token failed - Other \(error.debugDescription)"))
-            return .success(oldToken)
+            return .failure(error ?? MailError.unknownError)
         }
 
         // Couldn't refresh the token, API says it's invalid

MailResources/Localizable/de.lproj/Localizable.strings

@@ -4,8 +4,8 @@
  * Release: Working copy
  * Locale: de, German
  * Tagged: ios
- * Exported by: elena willen
- * Exported at: Thu, 31 Aug 2023 13:09:24 +0200
+ * Exported by: Philippe Weidmann
+ * Exported at: Wed, 13 Sep 2023 10:20:38 +0200
  */
 
 /* loco:6256793050618f7416758a32 */
@@ -1276,3 +1276,6 @@
 
 /* loco:64edf250cb0c86ab3001d1b2 */
 "buttonStart" = "Anfangen";
+
+/* loco:65016e82bd99726dde081533 */
+"noConnection" = "Keine Verbindung";

MailResources/Localizable/en.lproj/Localizable.strings

@@ -4,8 +4,8 @@
  * Release: Working copy
  * Locale: en, English
  * Tagged: ios
- * Exported by: elena willen
- * Exported at: Thu, 31 Aug 2023 13:09:24 +0200
+ * Exported by: Philippe Weidmann
+ * Exported at: Wed, 13 Sep 2023 10:20:38 +0200
  */
 
 /* loco:6256793050618f7416758a32 */
@@ -1276,3 +1276,6 @@
 
 /* loco:64edf250cb0c86ab3001d1b2 */
 "buttonStart" = "Start";
+
+/* loco:65016e82bd99726dde081533 */
+"noConnection" = "No connection";

MailResources/Localizable/es.lproj/Localizable.strings

@@ -4,8 +4,8 @@
  * Release: Working copy
  * Locale: es, Spanish
  * Tagged: ios
- * Exported by: elena willen
- * Exported at: Thu, 31 Aug 2023 13:09:24 +0200
+ * Exported by: Philippe Weidmann
+ * Exported at: Wed, 13 Sep 2023 10:20:38 +0200
  */
 
 /* loco:6256793050618f7416758a32 */
@@ -1276,3 +1276,6 @@
 
 /* loco:64edf250cb0c86ab3001d1b2 */
 "buttonStart" = "Empezar";
+
+/* loco:65016e82bd99726dde081533 */
+"noConnection" = "Sin conexión";

MailResources/Localizable/fr.lproj/Localizable.strings

@@ -4,8 +4,8 @@
  * Release: Working copy
  * Locale: fr, French
  * Tagged: ios
- * Exported by: elena willen
- * Exported at: Thu, 31 Aug 2023 13:09:24 +0200
+ * Exported by: Philippe Weidmann
+ * Exported at: Wed, 13 Sep 2023 10:20:38 +0200
  */
 
 /* loco:6256793050618f7416758a32 */
@@ -1276,3 +1276,6 @@
 
 /* loco:64edf250cb0c86ab3001d1b2 */
 "buttonStart" = "Commencer";
+
+/* loco:65016e82bd99726dde081533 */
+"noConnection" = "Pas de connexion";

MailResources/Localizable/it.lproj/Localizable.strings

@@ -4,8 +4,8 @@
  * Release: Working copy
  * Locale: it, Italian
  * Tagged: ios
- * Exported by: elena willen
- * Exported at: Thu, 31 Aug 2023 13:09:24 +0200
+ * Exported by: Philippe Weidmann
+ * Exported at: Wed, 13 Sep 2023 10:20:38 +0200
  */
 
 /* loco:6256793050618f7416758a32 */
@@ -1276,3 +1276,6 @@
 
 /* loco:64edf250cb0c86ab3001d1b2 */
 "buttonStart" = "Inizia";
+
+/* loco:65016e82bd99726dde081533 */
+"noConnection" = "Nessuna connessione";