clear code

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/Data/NCManageDatabase+Capabilities.swift

@@ -95,7 +95,6 @@ extension NCManageDatabase {
         NCGlobal.shared.capabilityE2EEEnabled = json["ocs", "data", "capabilities", "end-to-end-encryption", "enabled"].boolValue
         NCGlobal.shared.capabilityE2EEApiVersion = json["ocs", "data", "capabilities", "end-to-end-encryption", "api-version"].stringValue
 
-        NCGlobal.shared.capabilityExternalSites = json["ocs", "data", "capabilities", "external"].exists()
 
         NCGlobal.shared.capabilityRichdocumentsMimetypes.removeAll()
         let mimetypes = json["ocs", "data", "capabilities", "richdocuments", "mimetypes"].arrayValue
@@ -120,7 +119,7 @@ extension NCManageDatabase {
         NCGlobal.shared.capabilityFilesComments = json["ocs", "data", "capabilities", "files", "comments"].boolValue
 
         NCGlobal.shared.capabilityUserStatusEnabled = json["ocs", "data", "capabilities", "user_status", "enabled"].boolValue
-
+        NCGlobal.shared.capabilityExternalSites = json["ocs", "data", "capabilities", "external"].exists()
         NCGlobal.shared.capabilityGroupfoldersEnabled = json["ocs", "data", "capabilities", "groupfolders", "hasGroupFolders"].boolValue
     }
 }

iOSClient/NCGlobal.swift

@@ -408,39 +408,37 @@ class NCGlobal: NSObject {
 
     // CAPABILITIES
     //
-    var capabilityServerVersionMajor: Int = 0
-    @objc var capabilityServerVersion: String = ""
+    var capabilityServerVersionMajor: Int                       = 0
+    @objc var capabilityServerVersion: String                   = ""
     
-    var capabilityFileSharingApiEnabled: Bool = false
-    var capabilityFileSharingPubPasswdEnforced: Bool = false
-    var capabilityFileSharingPubExpireDateEnforced: Bool = false
-    var capabilityFileSharingPubExpireDateDays: Int = 0
-    var capabilityFileSharingInternalExpireDateEnforced: Bool = false
-    var capabilityFileSharingInternalExpireDateDays: Int = 0
-    var capabilityFileSharingRemoteExpireDateEnforced: Bool = false
-    var capabilityFileSharingRemoteExpireDateDays: Int = 0
-    var capabilityFileSharingDefaultPermission: Int = 0
-
-    var capabilityThemingColor: String = ""
-    var capabilityThemingColorElement: String = ""
-    var capabilityThemingColorText: String = ""
-    @objc var capabilityThemingName: String = ""
-    @objc var capabilityThemingSlogan: String = ""
-
-    @objc var capabilityE2EEEnabled: Bool = false
-    @objc var capabilityE2EEApiVersion: String = ""
-
-    var capabilityExternalSites: Bool = false
-
-    var capabilityRichdocumentsMimetypes: [String] = []
-    var capabilityActivity: [String] = []
-    var capabilityNotification: [String] = []
-
-    var capabilityFilesUndelete: Bool = false
-    var capabilityFilesLockVersion: String = "" // NC 24
-    var capabilityFilesComments: Bool = false // NC 20
-
-    @objc var capabilityUserStatusEnabled: Bool = false
-
-    var capabilityGroupfoldersEnabled: Bool = false
+    var capabilityFileSharingApiEnabled: Bool                   = false
+    var capabilityFileSharingPubPasswdEnforced: Bool            = false
+    var capabilityFileSharingPubExpireDateEnforced: Bool        = false
+    var capabilityFileSharingPubExpireDateDays: Int             = 0
+    var capabilityFileSharingInternalExpireDateEnforced: Bool   = false
+    var capabilityFileSharingInternalExpireDateDays: Int        = 0
+    var capabilityFileSharingRemoteExpireDateEnforced: Bool     = false
+    var capabilityFileSharingRemoteExpireDateDays: Int          = 0
+    var capabilityFileSharingDefaultPermission: Int             = 0
+
+    var capabilityThemingColor: String                          = ""
+    var capabilityThemingColorElement: String                   = ""
+    var capabilityThemingColorText: String                      = ""
+    @objc var capabilityThemingName: String                     = ""
+    @objc var capabilityThemingSlogan: String                   = ""
+
+    @objc var capabilityE2EEEnabled: Bool                       = false
+    @objc var capabilityE2EEApiVersion: String                  = ""
+
+    var capabilityRichdocumentsMimetypes: [String]              = []
+    var capabilityActivity: [String]                            = []
+    var capabilityNotification: [String]                        = []
+
+    var capabilityFilesUndelete: Bool                           = false
+    var capabilityFilesLockVersion: String                      = ""    // NC 24
+    var capabilityFilesComments: Bool                           = false // NC 20
+
+    @objc var capabilityUserStatusEnabled: Bool                 = false
+    var capabilityExternalSites: Bool                           = false
+    var capabilityGroupfoldersEnabled: Bool                     = false // NC27
 }