feat: improve network error alerts - WPB-20669 🍒 (#3684)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: zenkins <[email protected]>
Co-authored-by: François Benaiteau <[email protected]>

Author: 4 people

WireAuthentication/Sources/WireAuthenticationUI/Resources/Localization/de.lproj/Localizable.strings

@@ -33,14 +33,14 @@
 "login.sso.title" = "Anmelden";
 "login.sso.expiration_message" = "Ihre Session ist abgelaufen. Melden Sie sich mit Ihrem Unternehmenskonto an, um fortzufahren.";
 "login.sso.input_code.title" = "SSO Zugangscode";
-"login.sso.input_code.placeholder" = "SSO Zugangscode eingeben";
+"login.sso.input_code.placeholder" = "SSO-Code eingeben";
 "login.sso.submit" = "Anmeldung für Unternehmen";
 
 "logout.button.title" = "Abmelden";
 "logout.alert.title" = "Abmelden";
-"logout.alert.message" = "Entscheiden Sie, ob Sie Ihre Gesprächshistorie behalten oder unwiderruflich von diesem Gerät löschen wollen.";
-"logout.alert.delete_data_button" = "Abmelden und Historie löschen";
-"logout.alert.keep_data_button" = "Abmelden und Historie behalten";
+"logout.alert.message" = "Entscheiden Sie, ob Sie Ihren Gesprächsverlauf behalten oder unwiderruflich von diesem Gerät löschen möchten.";
+"logout.alert.delete_data_button" = "Abmelden und Verlauf löschen";
+"logout.alert.keep_data_button" = "Abmelden und Verlauf behalten";
 "logout.alert.cancel" = "Abbrechen";
 
 "create_account_or_team.title" = "Sie haben kein Benutzerkonto? ";

WireMessaging/Sources/WireMessagingUI/Resources/Localization/de.lproj/Accessibility.strings

@@ -21,7 +21,7 @@
 
 // MARK: Conversation Files View
 "conversation.wireCells.files.close" = "Dateien schließen";
-"conversation.wireCells.files.loadMore.title" = "Load more";
+"conversation.wireCells.files.loadMore.title" = "Weitere Objekte laden";
 "conversation.wireCells.files.noData.title" = "Es gibt noch keine Dateien oder Ordner";
 "conversation.wireCells.files.noData.message" = "Hier finden Sie alle Dateien und Ordner, die in dieser Unterhaltung geteilt wurden.";
 "conversation.wireCells.files.pendingCells.title" = "Files are being prepared";

WireMessaging/Sources/WireMessagingUI/Resources/Localization/de.lproj/Localizable.strings

@@ -103,7 +103,7 @@
 // MARK: Conversation Files View
 "conversation.wireCells.files.navigationTitle" = "Dokumente";
 "conversation.wireCells.files.item.subtitle" = "%@ von %@";
-"conversation.wireCells.files.loadMore.title" = "Load more";
+"conversation.wireCells.files.loadMore.title" = "Weitere Objekte laden";
 "conversation.wireCells.files.item.menu.open" = "Öffnen";
 "conversation.wireCells.files.item.menu.download" = "Herunterladen";
 "conversation.wireCells.files.item.menu.rename" = "Umbenennen";

wire-ios-sync-engine/Source/SessionManager/SessionManager.swift

@@ -1094,6 +1094,16 @@ public final class SessionManager: NSObject, SessionManagerType {
                     error: .clientIsObsolete
                 )
                 return nil
+            } catch let error as URLError {
+                WireLogger.sessionManager.error(
+                    "failed to load user session due to url error code: \(error.errorCode)",
+                    attributes: .safePublic
+                )
+                delegate?.sessionManagerDidFailToLoadSession(
+                    for: account,
+                    error: .networkError(code: error.errorCode)
+                )
+                return nil
             } catch let error as SafeForLoggingStringConvertible {
                 WireLogger.sessionManager.error(
                     "failed to load user session: \(error.safeForLoggingDescription)",
@@ -2078,6 +2088,7 @@ public extension SessionManager {
         case buildIsBlacklisted
         case backendIsObsolete
         case clientIsObsolete
+        case networkError(code: Int)
         case genericError
 
     }

wire-ios-sync-engine/Source/UserSession/BlacklistReason.swift

@@ -18,7 +18,7 @@
 
 import Foundation
 
-public enum BlacklistReason {
+public enum BlacklistReason: Equatable {
     /// The app version is too old to be supported or has been explicitly blacklisted
     case appVersionBlacklisted
 
@@ -28,7 +28,27 @@ public enum BlacklistReason {
     /// The API versions supported by the backend are too old in comparison to the ones supported by the client
     case backendAPIVersionObsolete
 
+    /// The session failed to load due to network issues.
+    case networkError(code: Int)
+
     /// Some reason that the session couldn't be loaded.
     case genericError
 
+    public static func == (lhs: BlacklistReason, rhs: BlacklistReason) -> Bool {
+        switch (lhs, rhs) {
+        case (.appVersionBlacklisted, .appVersionBlacklisted):
+            true
+        case (.clientAPIVersionObsolete, .clientAPIVersionObsolete):
+            true
+        case (.backendAPIVersionObsolete, .backendAPIVersionObsolete):
+            true
+        case let (.networkError(lhsCode), .networkError(rhsCode)):
+            lhsCode == rhsCode
+        case (.genericError, .genericError):
+            true
+        default:
+            false
+        }
+    }
+
 }

wire-ios/Wire-iOS Share Extension/Resources/Localization/de.lproj/Localizable.strings

@@ -84,4 +84,4 @@
 "share_extension.error.update_required.obsolete_backend" = "Ihr Wire-Server muss aktualisiert werden. Bitte informieren Sie Ihren Systemadministrator.";
 
 "share_extension.error.open_app.title" = "App öffnen";
-"share_extension.error.open_app.message" = "Öffnen Sie Ihr Benutzerkonto in Wire und versuchen Sie es erneut.";
+"share_extension.error.open_app.message" = "Öffnen Sie dieses Konto in der App und versuchen Sie es erneut.";

wire-ios/Wire-iOS/Generated/Strings+Generated.swift

@@ -1204,14 +1204,22 @@ internal enum L10n {
           internal static let message = L10n.tr("Localizable", "account_blocked.generic_error.alert.message", fallback: "Please contact support if the error persists.")
           /// Retry
           internal static let retry = L10n.tr("Localizable", "account_blocked.generic_error.alert.retry", fallback: "Retry")
-          /// Send debug logs
-          internal static let sendLogs = L10n.tr("Localizable", "account_blocked.generic_error.alert.send_logs", fallback: "Send debug logs")
+          /// Send Debug Report
+          internal static let sendLogs = L10n.tr("Localizable", "account_blocked.generic_error.alert.send_logs", fallback: "Send Debug Report")
           /// Switch accounts
           internal static let switchAccounts = L10n.tr("Localizable", "account_blocked.generic_error.alert.switch_accounts", fallback: "Switch accounts")
           /// Something went wrong
           internal static let title = L10n.tr("Localizable", "account_blocked.generic_error.alert.title", fallback: "Something went wrong")
         }
       }
+      internal enum NetworkError {
+        internal enum Alert {
+          /// Please check your internet connection and try again.
+          internal static let message = L10n.tr("Localizable", "account_blocked.network_error.alert.message", fallback: "Please check your internet connection and try again.")
+          /// Network issue
+          internal static let title = L10n.tr("Localizable", "account_blocked.network_error.alert.title", fallback: "Network issue")
+        }
+      }
     }
     internal enum AccountDeletedMissingPasscodeAlert {
       /// In order to use Wire, please set a passcode in your device settings.

wire-ios/Wire-iOS/Resources/Localization/Base.lproj/Localizable.strings

@@ -2148,8 +2148,10 @@ to reset this device and log in again";
 "device.details.certificate_details.title" = "Certificate Details";
 "device.details.certificate_details.copy_to_clipboard" = "Copy to Clipboard";
 
+"account_blocked.network_error.alert.title" = "Network issue";
+"account_blocked.network_error.alert.message" = "Please check your internet connection and try again.";
 "account_blocked.generic_error.alert.title" = "Something went wrong";
 "account_blocked.generic_error.alert.message" = "Please contact support if the error persists.";
 "account_blocked.generic_error.alert.switch_accounts" = "Switch accounts";
-"account_blocked.generic_error.alert.send_logs" = "Send debug logs";
+"account_blocked.generic_error.alert.send_logs" = "Send Debug Report";
 "account_blocked.generic_error.alert.retry" = "Retry";

wire-ios/Wire-iOS/Resources/Localization/ar.lproj/Localizable.strings

@@ -2146,8 +2146,10 @@
 "device.details.certificate_details.title" = "Certificate Details";
 "device.details.certificate_details.copy_to_clipboard" = "Copy to Clipboard";
 
+"account_blocked.network_error.alert.title" = "Network issue";
+"account_blocked.network_error.alert.message" = "Please check your internet connection and try again.";
 "account_blocked.generic_error.alert.title" = "حدث خطأ";
 "account_blocked.generic_error.alert.message" = "Please contact support if the error persists.";
 "account_blocked.generic_error.alert.switch_accounts" = "Switch accounts";
-"account_blocked.generic_error.alert.send_logs" = "Send debug logs";
+"account_blocked.generic_error.alert.send_logs" = "Send Debug Report";
 "account_blocked.generic_error.alert.retry" = "Retry";

wire-ios/Wire-iOS/Resources/Localization/da.lproj/Localizable.strings

@@ -2146,8 +2146,10 @@
 "device.details.certificate_details.title" = "Certificate Details";
 "device.details.certificate_details.copy_to_clipboard" = "Copy to Clipboard";
 
+"account_blocked.network_error.alert.title" = "Network issue";
+"account_blocked.network_error.alert.message" = "Please check your internet connection and try again.";
 "account_blocked.generic_error.alert.title" = "Noget gik galt";
 "account_blocked.generic_error.alert.message" = "Please contact support if the error persists.";
 "account_blocked.generic_error.alert.switch_accounts" = "Switch accounts";
-"account_blocked.generic_error.alert.send_logs" = "Send debug logs";
+"account_blocked.generic_error.alert.send_logs" = "Send Debug Report";
 "account_blocked.generic_error.alert.retry" = "Retry";