RESPONSE ERROR - CENTRALIZED

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
nextcloud · Oct 21, 2024 · b6f6c0c · b6f6c0c
1 parent dc721df
commit b6f6c0c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/iOSClient/NCGlobal.swift b/iOSClient/NCGlobal.swift
@@ -201,6 +201,7 @@ class NCGlobal: NSObject {
     let errorPreconditionFailed: Int            = 412
     let errorUnsupportedMediaType: Int          = 415
     let errorInternalServerError: Int           = 500
+    let errorMaintenance: Int                   = 503
     let errorQuota: Int                         = 507
     let errorUnauthorized997: Int               = 997
     let errorExplicitlyCancelled: Int           = -999

diff --git a/iOSClient/Networking/NCNetworking.swift b/iOSClient/Networking/NCNetworking.swift
@@ -164,7 +164,20 @@ class NCNetworking: NSObject, NextcloudKitDelegate {
 #endif
     }
 
-    func request<Value>(_ request: Alamofire.DataRequest, didParseResponse response: Alamofire.AFDataResponse<Value>) { }
+    func request<Value>(_ request: Alamofire.DataRequest, didParseResponse response: Alamofire.AFDataResponse<Value>) {
+        /// RESPONSE ERROR
+        if let statusCode = response.response?.statusCode {
+            switch statusCode {
+            case NCGlobal.shared.errorMaintenance:
+                if let errorDescription = NKError.getErrorDescription(for: statusCode) {
+                    let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: errorDescription)
+                    NCContentPresenter().showWarning(error: error, priority: .max)
+                }
+            default:
+                break
+            }
+        }
+    }
 
     // MARK: -
 

diff --git a/iOSClient/Networking/NCService.swift b/iOSClient/Networking/NCService.swift
@@ -95,8 +95,6 @@ class NCService: NSObject {
         switch await NCNetworking.shared.getServerStatus(serverUrl: serverUrl, options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) {
         case .success(let serverInfo):
             if serverInfo.maintenance {
-                let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_maintenance_mode_")
-                NCContentPresenter().showWarning(error: error, priority: .max)
                 return false
             } else if serverInfo.productName.lowercased().contains("owncloud") {
                 let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_warning_owncloud_")

diff --git a/iOSClient/Supporting Files/en.lproj/Localizable.strings b/iOSClient/Supporting Files/en.lproj/Localizable.strings
@@ -1030,7 +1030,7 @@
 "_user_"                    = "User";
 "_add_subtitle_"            = "Add an external subtitle";
 "_add_audio_"               = "Add an external audio";
-"_maintenance_mode_"        = "Server is currently in maintenance mode";
+"_server_maintenance_mode_" = "Server is currently in maintenance mode";
 "_upload_foreground_msg_"   = "Do not close %@ to complete the transfer …";
 "_upload_background_msg_"   = "Files upload in progress …";
 "_create_folder_error_"     = "An error has occurred while creating the folder:\n%@.\n\nPlease resolve the issue as soon as possible.\n\nAll uploads are suspended until the problem is resolved.\n";