Merge pull request #2337 from nextcloud/fix_varie

Fix varie

Nextcloud.xcodeproj/project.pbxproj

@@ -3810,7 +3810,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -3873,7 +3873,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;

iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -177,6 +177,19 @@ extension tableMetadata {
         return directory && size == 0 && !e2eEncrypted && CCUtility.isEnd(toEndEnabled: account)
     }
 
+    var isSharable: Bool {
+        let sharing = NCManageDatabase.shared.getCapabilitiesServerBool(account: account, elements: NCElementsJSON.shared.capabilitiesFileSharingApiEnabled, exists: false)
+        if !sharing { return false }
+        if !e2eEncrypted && !isDirectoryE2EE { return true }
+        let serverVersionMajor = NCManageDatabase.shared.getCapabilitiesServerInt(account: account, elements: NCElementsJSON.shared.capabilitiesVersionMajor)
+        if serverVersionMajor >= NCGlobal.shared.nextcloudVersion26 && directory {
+            // E2EE DIRECTORY SECURE FILE DROP (SHARE AVAILABLE)
+            return true
+        } else {
+            return false
+        }
+    }
+
     var isDirectoryUnsettableE2EE: Bool {
         return !isDirectoryE2EE && directory && size == 0 && e2eEncrypted && CCUtility.isEnd(toEndEnabled: account)
     }

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1682,13 +1682,11 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
         }
 
         // ** IMPORT MUST BE AT THE END **
-        // if metadata.e2eEncrypted || isDirectoryE2EE {
         //
-        // E2EE SECURE FILE DROP (DIR ONLY)
-        if !metadata.directory && (metadata.e2eEncrypted || isDirectoryE2EE) {
+        if !metadata.isSharable {
             cell.hideButtonShare(true)
         }
-
+        
         return cell
     }
 

iOSClient/NCGlobal.swift

@@ -110,6 +110,7 @@ class NCGlobal: NSObject {
     let nextcloudVersion23: Int                     =  23
     let nextcloudVersion24: Int                     =  24
     let nextcloudVersion25: Int                     =  25
+    let nextcloudVersion26: Int                     =  26
 
     // Database Realm
     //

iOSClient/Networking/E2EE/NCEndToEndMetadata.swift

@@ -49,14 +49,14 @@ class NCEndToEndMetadata: NSObject {
 
         struct Files: Codable {
             let initializationVector: String
-            let authenticationTag: String
+            let authenticationTag: String?
             let metadataKey: Int
             let encrypted: String
         }
 
         struct Filedrop: Codable {
             let initializationVector: String
-            let authenticationTag: String
+            let authenticationTag: String?
             let metadataKey: Int
             let encrypted: String
         }
@@ -204,7 +204,7 @@ class NCEndToEndMetadata: NSObject {
                                 let object = tableE2eEncryption()
 
                                 object.account = account
-                                object.authenticationTag = authenticationTag
+                                object.authenticationTag = authenticationTag ?? ""
                                 object.blob = "files"
                                 object.fileName = encrypted.filename
                                 object.fileNameIdentifier = fileNameIdentifier
@@ -273,7 +273,7 @@ class NCEndToEndMetadata: NSObject {
                                 let object = tableE2eEncryption()
 
                                 object.account = account
-                                object.authenticationTag = authenticationTag
+                                object.authenticationTag = authenticationTag ?? ""
                                 object.blob = "filedrop"
                                 object.fileName = encrypted.filename
                                 object.fileNameIdentifier = fileNameIdentifier

iOSClient/Share/NCSharePaging.swift

@@ -54,7 +54,9 @@ class NCSharePaging: UIViewController {
         navigationItem.leftBarButtonItem = UIBarButtonItem(title: NSLocalizedString("_close_", comment: ""), style: .done, target: self, action: #selector(exitTapped))
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(notification:)), name: UIResponder.keyboardWillShowNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(notification:)), name: UIResponder.keyboardWillHideNotification, object: nil)
+
         setupCapabilities()
+
         // *** MUST BE THE FIRST ONE ***
         pagingViewController.metadata = metadata
 
@@ -111,8 +113,7 @@ class NCSharePaging: UIViewController {
         if serverVersionMajor >= NCGlobal.shared.nextcloudVersion20 && comments == false {
             commentsEnabled = false
         }
-        let sharing = NCManageDatabase.shared.getCapabilitiesServerBool(account: appDelegate.account, elements: NCElementsJSON.shared.capabilitiesFileSharingApiEnabled, exists: false)
-        sharingEnabled = sharing
+        sharingEnabled = metadata.isSharable
         let activity = NCManageDatabase.shared.getCapabilitiesServerArray(account: appDelegate.account, elements: NCElementsJSON.shared.capabilitiesActivity)
         activityEnabled = activity != nil
         if indexPage == .sharing && !sharingEnabled {