fix

iOSClient/Main/Cell/NCGridCell.swift

@@ -43,7 +43,7 @@ class NCGridCell: UICollectionViewCell {
 
     var delegate: NCGridCellDelegate?
     
-    var ocId = ""
+    var objectId = ""
     var indexPath = IndexPath()
     
     let labelTitleTrailingConstant: CGFloat = 50
@@ -58,7 +58,7 @@ class NCGridCell: UICollectionViewCell {
     }
     
     @IBAction func touchUpInsideMore(_ sender: Any) {
-        delegate?.tapMoreGridItem(with: ocId, sender: sender)
+        delegate?.tapMoreGridItem(with: objectId, sender: sender)
     }
     
     func hide(buttonMore: Bool, hideImageShare: Bool) {
@@ -97,5 +97,5 @@ class NCGridCell: UICollectionViewCell {
 }
 
 protocol NCGridCellDelegate {
-    func tapMoreGridItem(with ocId: String, sender: Any)
+    func tapMoreGridItem(with objectId: String, sender: Any)
 }

iOSClient/Main/Cell/NCListCell.swift

@@ -49,7 +49,7 @@ class NCListCell: UICollectionViewCell {
 
     var delegate: NCListCellDelegate?
     
-    var ocId = ""
+    var objectId = ""
     var indexPath = IndexPath()
 
     let labelTitleTrailingConstant: CGFloat = 75
@@ -66,7 +66,7 @@ class NCListCell: UICollectionViewCell {
     }
     
     @IBAction func touchUpInsideMore(_ sender: Any) {
-        delegate?.tapMoreListItem(with: ocId, sender: sender)
+        delegate?.tapMoreListItem(with: objectId, sender: sender)
     }
     
     func hide(buttonMore: Bool, hideImageShare: Bool) {
@@ -109,5 +109,5 @@ class NCListCell: UICollectionViewCell {
 }
 
 protocol NCListCellDelegate {
-    func tapMoreListItem(with ocId: String, sender: Any)
+    func tapMoreListItem(with objectId: String, sender: Any)
 }

iOSClient/Main/NCMainCommon.swift

@@ -262,7 +262,7 @@ class NCMainCommon: NSObject, PhotoEditorDelegate, NCAudioRecorderViewController
            
             cell.delegate = source as? NCListCellDelegate
             
-            cell.ocId = metadata.ocId
+            cell.objectId = metadata.ocId
             cell.indexPath = indexPath
             cell.labelTitle.text = metadata.fileNameView
             cell.imageStatus.image = nil
@@ -368,7 +368,7 @@ class NCMainCommon: NSObject, PhotoEditorDelegate, NCAudioRecorderViewController
 
             cell.delegate = source as? NCGridCellDelegate
             
-            cell.ocId = metadata.ocId
+            cell.objectId = metadata.ocId
             cell.indexPath = indexPath
             cell.labelTitle.text = metadata.fileNameView
             cell.imageStatus.image = nil

iOSClient/Offline/NCOffline.swift

@@ -302,13 +302,13 @@ class NCOffline: UIViewController, UIGestureRecognizerDelegate, NCListCellDelega
         
     }
     
-    func tapMoreListItem(with ocId: String, sender: Any) {
-        tapMoreGridItem(with: ocId, sender: sender)
+    func tapMoreListItem(with objectId: String, sender: Any) {
+        tapMoreGridItem(with: objectId, sender: sender)
     }
     
-    func tapMoreGridItem(with ocId: String, sender: Any) {
+    func tapMoreGridItem(with objectId: String, sender: Any) {
         
-        guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@", ocId)) else {
+        guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@", objectId)) else {
             return
         }
         

iOSClient/Select/NCSelect.swift

@@ -389,10 +389,10 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, NCListCellDelegat
         
     }
     
-    func tapMoreListItem(with ocId: String, sender: Any) {
+    func tapMoreListItem(with objectId: String, sender: Any) {
     }
     
-    func tapMoreGridItem(with ocId: String, sender: Any) {
+    func tapMoreGridItem(with objectId: String, sender: Any) {
     }
     
     // MARK: DROP-DOWN-MENU

iOSClient/Trash/Cell/NCTrashListCell.swift

@@ -43,7 +43,7 @@ class NCTrashListCell: UICollectionViewCell {
 
     var delegate: NCTrashListCellDelegate?
     
-    var ocId = ""
+    var objectId = ""
     var indexPath = IndexPath()
 
     override func awakeFromNib() {
@@ -56,15 +56,15 @@ class NCTrashListCell: UICollectionViewCell {
     }
     
     @IBAction func touchUpInsideMore(_ sender: Any) {
-        delegate?.tapMoreListItem(with: ocId, sender: sender)
+        delegate?.tapMoreListItem(with: objectId, sender: sender)
     }
     
     @IBAction func touchUpInsideRestore(_ sender: Any) {
-        delegate?.tapRestoreListItem(with: ocId, sender: sender)
+        delegate?.tapRestoreListItem(with: objectId, sender: sender)
     }
 }
 
 protocol NCTrashListCellDelegate {
-    func tapRestoreListItem(with ocId: String, sender: Any)
-    func tapMoreListItem(with ocId: String, sender: Any)
+    func tapRestoreListItem(with objectId: String, sender: Any)
+    func tapMoreListItem(with objectId: String, sender: Any)
 }

iOSClient/Trash/NCTrash.swift

@@ -268,7 +268,7 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
         }
     }
     
-    func tapMoreListItem(with ocId: String, sender: Any) {
+    func tapMoreListItem(with objectId: String, sender: Any) {
 
         if !isEditMode {
             var items = [ActionSheetItem]()
@@ -277,11 +277,11 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
             items.append(ActionSheetCancelButton(title: NSLocalizedString("_cancel_", comment: "")))
             
             actionSheet = ActionSheet(items: items) { sheet, item in
-                if item is ActionSheetDangerButton { self.deleteItem(with: ocId) }
+                if item is ActionSheetDangerButton { self.deleteItem(with: objectId) }
                 if item is ActionSheetCancelButton { print("Cancel buttons has the value `true`") }
             }
             
-            guard let tableTrash = NCManageDatabase.sharedInstance.getTrashItem(fileId: ocId, account: appDelegate.activeAccount) else {
+            guard let tableTrash = NCManageDatabase.sharedInstance.getTrashItem(fileId: objectId, account: appDelegate.activeAccount) else {
                 return
             }
             
@@ -297,7 +297,7 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
         }
     }
     
-    func tapMoreGridItem(with ocId: String, sender: Any) {
+    func tapMoreGridItem(with objectId: String, sender: Any) {
         
         if !isEditMode {
             var items = [ActionSheetItem]()
@@ -311,12 +311,12 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
             items.append(ActionSheetCancelButton(title: NSLocalizedString("_cancel_", comment: "")))
             
             actionSheet = ActionSheet(items: items) { sheet, item in
-                if item.value as? Int == 0 { self.restoreItem(with: ocId) }
-                if item.value as? Int == 1 { self.deleteItem(with: ocId) }
+                if item.value as? Int == 0 { self.restoreItem(with: objectId) }
+                if item.value as? Int == 1 { self.deleteItem(with: objectId) }
                 if item is ActionSheetCancelButton { print("Cancel buttons has the value `true`") }
             }
             
-            guard let tableTrash = NCManageDatabase.sharedInstance.getTrashItem(fileId: ocId, account: appDelegate.activeAccount) else {
+            guard let tableTrash = NCManageDatabase.sharedInstance.getTrashItem(fileId: objectId, account: appDelegate.activeAccount) else {
                 return
             }
             
@@ -557,7 +557,7 @@ extension NCTrash: UICollectionViewDataSource {
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "listCell", for: indexPath) as! NCTrashListCell
             cell.delegate = self
             
-            cell.ocId = tableTrash.fileId
+            cell.objectId = tableTrash.fileId
             cell.indexPath = indexPath
             cell.labelTitle.text = tableTrash.trashbinFileName
             
@@ -594,7 +594,7 @@ extension NCTrash: UICollectionViewDataSource {
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "gridCell", for: indexPath) as! NCGridCell
             cell.delegate = self
             
-            cell.ocId = tableTrash.fileId
+            cell.objectId = tableTrash.fileId
             cell.indexPath = indexPath
             cell.labelTitle.text = tableTrash.trashbinFileName