capabilities

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

iOSClient/Data/NCManageDatabase+Capabilities.swift

@@ -202,11 +202,10 @@ extension NCManageDatabase {
         }
 
         NCGlobal.shared.capabilityFilesUndelete = json["ocs", "data", "capabilities", "files", "undelete"].boolValue
-        NCGlobal.shared.capabilityFilesLockVersion = json["ocs", "data", "capabilities", "files", "locking"].intValue
+        NCGlobal.shared.capabilityFilesLockVersion = json["ocs", "data", "capabilities", "files", "locking"].stringValue
         NCGlobal.shared.capabilityFilesComments = json["ocs", "data", "capabilities", "files", "comments"].boolValue
 
         NCGlobal.shared.capabilityUserStatusEnabled = json["ocs", "data", "capabilities", "user_status", "enabled"].boolValue
-        NCGlobal.shared.capabilityUserStatusSupportsEmoji = json["ocs", "data", "capabilities", "user_status", "supports_emoji"].boolValue
 
         NCGlobal.shared.capabilityGroupfoldersEnabled = json["ocs", "data", "capabilities", "groupfolders", "hasGroupFolders"].boolValue
     }

iOSClient/Diagnostics/NCCapabilitiesView.swift

@@ -97,7 +97,7 @@ class NCCapabilitiesViewOO: ObservableObject {
         capabililies.append(Capability(text: "Comments", image: UIImage(systemName: "ellipsis.bubble")!, available: NCGlobal.shared.capabilityFilesComments))
 
         // LOCK FILE
-        capabililies.append(Capability(text: "Lock file", image: UIImage(systemName: "lock")!, available: NCGlobal.shared.capabilityFilesLockVersion >= 1))
+        capabililies.append(Capability(text: "Lock file", image: UIImage(systemName: "lock")!, available: !NCGlobal.shared.capabilityFilesLockVersion.isEmpty))
 
         // GROUP FOLDERS
         capabililies.append(Capability(text: "Group folders", image: UIImage(systemName: "person.2")!, available: NCGlobal.shared.capabilityGroupfoldersEnabled))

iOSClient/Main/Collection Common/NCSelectableNavigationView.swift

@@ -128,7 +128,7 @@ extension NCSelectableNavigationView where Self: UIViewController {
 
         actions.append(.openInAction(selectedMetadatas: selectedMetadatas, viewController: self, completion: tapSelect))
 
-        if !isAnyFolder, canUnlock, NCGlobal.shared.capabilityFilesLockVersion >= 1 {
+        if !isAnyFolder, canUnlock, !NCGlobal.shared.capabilityFilesLockVersion.isEmpty {
             actions.append(.lockUnlockFiles(shouldLock: !isAnyLocked, metadatas: selectedMetadatas, completion: tapSelect))
         }
 

iOSClient/Main/NCActionCenter.swift

@@ -215,6 +215,10 @@ class NCActionCenter: NSObject, UIDocumentInteractionControllerDelegate, NCSelec
                 if !metadata.isSharable(), let idx = pages.firstIndex(of: .sharing) {
                     pages.remove(at: idx)
                 }
+                if pages.isEmpty {
+                    return
+                }
+
                 (pages, page) = NCApplicationHandle().filterPages(pages: pages, page: page, metadata: metadata)
 
                 if pages.contains(page) {

iOSClient/Menu/NCCollectionViewCommon+Menu.swift

@@ -140,7 +140,7 @@ extension NCCollectionViewCommon {
         //
         // LOCK / UNLOCK
         //
-        if !metadata.directory, metadata.canUnlock(as: appDelegate.userId), NCGlobal.shared.capabilityFilesLockVersion >= 1 {
+        if !metadata.directory, metadata.canUnlock(as: appDelegate.userId), !NCGlobal.shared.capabilityFilesLockVersion.isEmpty {
             actions.append(NCMenuAction.lockUnlockFiles(shouldLock: !metadata.lock, metadatas: [metadata], order: 30))
         }
 

iOSClient/NCGlobal.swift

@@ -436,11 +436,10 @@ class NCGlobal: NSObject {
     var capabilityNotification: [String] = []
 
     var capabilityFilesUndelete: Bool = false
-    var capabilityFilesLockVersion: Int = 0 // NC 24
+    var capabilityFilesLockVersion: String = "" // NC 24
     var capabilityFilesComments: Bool = false // NC 20
 
     @objc var capabilityUserStatusEnabled: Bool = false
-    var capabilityUserStatusSupportsEmoji: Bool = false
 
     var capabilityGroupfoldersEnabled: Bool = false
 }

iOSClient/Networking/NCService.swift

@@ -177,6 +177,8 @@ class NCService: NSObject {
                 return
             }
 
+            data.printJson()
+            
             NCManageDatabase.shared.addCapabilitiesJSon(data, account: account)
             NCManageDatabase.shared.setCapabilities(account: account, data: data)