share

iOSClient/Share/Advanced/NCShareAdvancePermission.swift

@@ -46,7 +46,7 @@ class NCShareAdvancePermission: UITableViewController, NCShareAdvanceFotterDeleg
             return
         }
         Task {
-            if metadata.e2eEncrypted {
+            if metadata.e2eEncrypted && NCGlobal.shared.capabilityE2EEApiVersion == NCGlobal.shared.e2eeVersionV20 {
                 let serverUrl = metadata.serverUrl + "/" + metadata.fileName
                 let error = await NCNetworkingE2EE.shared.uploadMetadata(account: metadata.account, serverUrl: serverUrl, userId: metadata.userId, addUserId: share.shareWith)
                 if error != .success {

iOSClient/Share/Advanced/NCShareCells.swift

@@ -90,7 +90,7 @@ enum NCUserPermission: CaseIterable, NCPermission {
 
     case reshare, edit, create, delete, download
     static let forDirectory: [NCUserPermission] = NCUserPermission.allCases
-    static let forDirectoryE2EE: [NCUserPermission] = NCUserPermission.allCases // []
+    static let forDirectoryE2EE: [NCUserPermission] = NCGlobal.shared.capabilityE2EEApiVersion == NCGlobal.shared.e2eeVersionV20 ? NCUserPermission.allCases : []
     static let forFile: [NCUserPermission] = [.reshare, .edit]
 
     var title: String {
@@ -180,7 +180,7 @@ enum NCLinkPermission: NCPermission {
     case allowEdit, viewOnly, uploadEdit, fileDrop, secureFileDrop
     static let forDirectory: [NCLinkPermission] = [.viewOnly, .uploadEdit, .fileDrop]
     static let forFile: [NCLinkPermission] = [.allowEdit]
-    static let forDirectoryE2EE: [NCLinkPermission] = [.viewOnly, .uploadEdit, .fileDrop] // [.secureFileDrop]
+    static let forDirectoryE2EE: [NCLinkPermission] = [.secureFileDrop]
 }
 
 enum NCShareDetails: CaseIterable, NCShareCellConfig {

iOSClient/Share/NCShare+Helper.swift

@@ -81,11 +81,11 @@ class NCTableShareOptions: NCTableShareable {
     var attributes: String?
 
     private init(shareType: Int, metadata: tableMetadata, password: String?) {
-        // if metadata.e2eEncrypted {
-        //    self.permissions = NCGlobal.shared.permissionCreateShare
-        // } else {
+        if metadata.e2eEncrypted && NCGlobal.shared.capabilityE2EEApiVersion == NCGlobal.shared.e2eeVersionV12 {
+            self.permissions = NCGlobal.shared.permissionCreateShare
+        } else {
             self.permissions = NCGlobal.shared.capabilityFileSharingDefaultPermission & metadata.sharePermissionsCollaborationServices
-        // }
+        }
         self.shareType = shareType
         if let password = password {
             self.password = password

iOSClient/Share/NCShare.swift

@@ -84,12 +84,12 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
 
         guard let metadata = metadata else { return }
 
-        // if metadata.e2eEncrypted {
-        //    searchFieldTopConstraint.constant = -50
-        //    searchField.isHidden = true
-        // } else {
+        if metadata.e2eEncrypted && NCGlobal.shared.capabilityE2EEApiVersion == NCGlobal.shared.e2eeVersionV12 {
+            searchFieldTopConstraint.constant = -50
+            searchField.isHidden = true
+         } else {
             checkSharedWithYou()
-        // }
+         }
 
         reloadData()
 
@@ -301,12 +301,12 @@ extension NCShare: UITableViewDataSource {
         guard let metadata = self.metadata else { return 0}
         var numRows = shares.share?.count ?? 0
         if section == 0 {
-            // if metadata.e2eEncrypted {
-            //    numRows = 1
-            // } else {
+            if metadata.e2eEncrypted && NCGlobal.shared.capabilityE2EEApiVersion == NCGlobal.shared.e2eeVersionV12 {
+                numRows = 1
+            } else {
                 // don't allow link creation if reshare is disabled
                 numRows = shares.firstShareLink != nil || canReshare ? 2 : 1
-            // }
+            }
         }
         return numRows
     }
@@ -317,15 +317,15 @@ extension NCShare: UITableViewDataSource {
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "cellLink", for: indexPath) as? NCShareLinkCell, let metadata = self.metadata
             else { return UITableViewCell() }
             cell.delegate = self
-            // if metadata.e2eEncrypted {
-            //    cell.tableShare = shares.firstShareLink
-            // } else {
+            if metadata.e2eEncrypted && NCGlobal.shared.capabilityE2EEApiVersion == NCGlobal.shared.e2eeVersionV12 {
+                cell.tableShare = shares.firstShareLink
+            } else {
                 if indexPath.row == 0 {
                     cell.isInternalLink = true
                 } else if shares.firstShareLink?.isInvalidated != true {
                     cell.tableShare = shares.firstShareLink
                 }
-            // }
+            }
             cell.setupCellUI()
             return cell
         }

iOSClient/Share/NCSharePaging.swift

@@ -95,7 +95,7 @@ class NCSharePaging: UIViewController {
         } else {
             pagingViewController.select(index: 0)
         }
-       
+
         (pagingViewController.view as? NCSharePagingView)?.setupConstraints()
         pagingViewController.reloadMenu()
     }