coding

Share/NCShareExtension.swift

@@ -521,8 +521,8 @@ extension NCShareExtension: UICollectionViewDataSource {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "listCell", for: indexPath) as! NCListCell
         cell.delegate = self
         
-        cell.objectId = metadata.ocId
-        cell.user = metadata.ownerId
+        cell.fileObjectId = metadata.ocId
+        cell.fileUser = metadata.ownerId
         cell.labelTitle.text = metadata.fileNameView
         cell.labelTitle.textColor = NCBrandColor.shared.label
         

iOSClient/Activity/NCActivity.swift

@@ -119,12 +119,13 @@ class activityTableViewCell: UITableViewCell, NCCellProtocol {
     @IBOutlet weak var subjectTrailingConstraint: NSLayoutConstraint!
     @IBOutlet weak var collectionViewHeightConstraint: NSLayoutConstraint!
 
+    private var user: String = ""
+
     var idActivity: Int = 0
     var account: String = ""
     var activityPreviews: [tableActivityPreview] = []
     var didSelectItemEnable: Bool = true
     var viewController: UIViewController? = nil
-    var user: String = ""
     
     var fileAvatarImageView: UIImageView? {
         get {
@@ -145,6 +146,9 @@ class activityTableViewCell: UITableViewCell, NCCellProtocol {
         get {
             return user
         }
+        set {
+            user = newValue ?? ""
+        }
     }
     
     override func awakeFromNib() {
@@ -249,7 +253,7 @@ extension NCActivity: UITableViewDataSource {
                 
                 cell.subjectTrailingConstraint.constant = 50
                 cell.avatar.isHidden = false
-                cell.user = activity.user
+                cell.fileUser = activity.user
                 
                 let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + String(CCUtility.getStringUser(appDelegate.user, urlBase: appDelegate.urlBase)) + "-" + activity.user + ".png"
                 NCOperationQueue.shared.downloadAvatar(user: activity.user, fileNameLocalPath: fileNameLocalPath, placeholder: UIImage(named: "avatar"), cell: cell)

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1422,8 +1422,8 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "listCell", for: indexPath) as! NCListCell
             cell.delegate = self
             
-            cell.objectId = metadata.ocId
-            cell.user = metadata.ownerId
+            cell.fileObjectId = metadata.ocId
+            cell.fileUser = metadata.ownerId
             cell.labelTitle.text = metadata.fileNameView
             cell.labelTitle.textColor = NCBrandColor.shared.label
             cell.labelInfo.text = ""
@@ -1596,8 +1596,8 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "gridCell", for: indexPath) as! NCGridCell
             cell.delegate = self
             
-            cell.objectId = metadata.ocId
-            cell.user = metadata.ownerId
+            cell.fileObjectId = metadata.ocId
+            cell.fileUser = metadata.ownerId
             cell.labelTitle.text = metadata.fileNameView
             cell.labelTitle.textColor = NCBrandColor.shared.label
             

iOSClient/Main/Collection Common/NCGridCell.swift

@@ -35,30 +35,37 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
     @IBOutlet weak var imageVisualEffect: UIVisualEffectView!
     @IBOutlet weak var progressView: UIProgressView!
 
+    private var objectId = ""
+    private var user = ""
+
     var delegate: NCGridCellDelegate?
-    var objectId = ""
     var namedButtonMore = ""
-    var user = ""
 
     var fileAvatarImageView: UIImageView? {
-        get{
+        get {
             return nil
         }
     }
     var fileObjectId: String? {
-        get{
+        get {
             return objectId
         }
+        set {
+            objectId = newValue ?? ""
+        }
     }
     var filePreviewImageView: UIImageView? {
-        get{
+        get {
             return imageItem
         }
     }
     var fileUser: String? {
-        get{
+        get {
             return user
         }
+        set {
+            user = newValue ?? ""
+        }
     }
     
     override func awakeFromNib() {

iOSClient/Main/Collection Common/NCListCell.swift

@@ -41,30 +41,37 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
     @IBOutlet weak var separator: UIView!
     @IBOutlet weak var separatorHeightConstraint: NSLayoutConstraint!
 
+    private var objectId = ""
+    private var user = ""
+
     var delegate: NCListCellDelegate?
-    var objectId = ""
     var namedButtonMore = ""
-    var user = ""
 
     var fileAvatarImageView: UIImageView? {
-        get{
+        get {
             return imageShared
         }
     }
     var fileObjectId: String? {
-        get{
+        get {
             return objectId
         }
+        set {
+            objectId = newValue ?? ""
+        }
     }
     var filePreviewImageView : UIImageView? {
-        get{
+        get {
             return imageItem
         }
     }
     var fileUser: String? {
-        get{
+        get {
             return user
         }
+        set {
+            user = newValue ?? ""
+        }
     }
     
     override func awakeFromNib() {

iOSClient/Media/Cell/NCGridMediaCell.swift

@@ -30,29 +30,36 @@ class NCGridMediaCell: UICollectionViewCell, NCCellProtocol {
     @IBOutlet weak var imageSelect: UIImageView!
     @IBOutlet weak var imageStatus: UIImageView!
     
-    var date: Date?
-    var objectId: String = ""
-    var user: String = ""
+    private var objectId: String = ""
+    private var user: String = ""
     
+    var date: Date?
+
     var filePreviewImageView: UIImageView? {
         get {
             return imageItem
         }
     }
     var fileAvatarImageView: UIImageView? {
-        get{
+        get {
             return nil
         }
     }
     var fileObjectId: String? {
-        get{
+        get {
             return objectId
         }
+        set {
+            objectId = newValue ?? ""
+        }
     }
     var fileUser: String? {
-        get{
+        get {
             return user
         }
+        set {
+            user = newValue ?? ""
+        }
     }
     
     override func awakeFromNib() {

iOSClient/Media/NCMedia.swift

@@ -419,8 +419,8 @@ extension NCMedia: UICollectionViewDataSource {
             self.cellHeigth = cell.frame.size.height
 
             cell.date = metadata.date as Date
-            cell.objectId = metadata.ocId
-            cell.user = metadata.ownerId
+            cell.fileObjectId = metadata.ocId
+            cell.fileUser = metadata.ownerId
 
             if metadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue || metadata.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue {
                 cell.imageStatus.image = cacheImages.cellPlayImage

iOSClient/Notification/NCNotification.swift

@@ -145,7 +145,7 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
                         } else {
                             cell.avatar.isHidden = false
                             cell.avatarLeadingMargin.constant = 50
-                            cell.user = userId
+                            cell.fileUser = userId
                             NCOperationQueue.shared.downloadAvatar(user: userId, fileNameLocalPath: fileNameLocalPath, placeholder: UIImage(named: "avatar"), cell: cell)
                         }
                     }
@@ -330,9 +330,10 @@ class NCNotificationCell: UITableViewCell, NCCellProtocol {
     @IBOutlet weak var primaryWidth: NSLayoutConstraint!
     @IBOutlet weak var secondaryWidth: NSLayoutConstraint!
     
+    private var user = ""
+
     var delegate: NCNotificationCellDelegate?
     var notification: NCCommunicationNotifications?
-    var user: String = ""
     
     var filePreviewImageView : UIImageView? {
         get {
@@ -353,6 +354,9 @@ class NCNotificationCell: UITableViewCell, NCCellProtocol {
         get {
             return user
         }
+        set {
+            user = newValue ?? ""
+        }
     }
     
     override func awakeFromNib() {

iOSClient/Select/NCSelect.swift

@@ -444,8 +444,8 @@ extension NCSelect: UICollectionViewDataSource {
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "listCell", for: indexPath) as! NCListCell
             cell.delegate = self
             
-            cell.objectId = metadata.ocId
-            cell.user = metadata.ownerId
+            cell.fileObjectId = metadata.ocId
+            cell.fileUser = metadata.ownerId
             cell.labelTitle.text = metadata.fileNameView
             cell.labelTitle.textColor = NCBrandColor.shared.label
             
@@ -547,8 +547,8 @@ extension NCSelect: UICollectionViewDataSource {
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "gridCell", for: indexPath) as! NCGridCell
             cell.delegate = self
             
-            cell.objectId = metadata.ocId
-            cell.user = metadata.ownerId
+            cell.fileObjectId = metadata.ocId
+            cell.fileUser = metadata.ownerId
             cell.labelTitle.text = metadata.fileNameView
             cell.labelTitle.textColor = NCBrandColor.shared.label
             

iOSClient/Share/NCShare.swift

@@ -318,7 +318,7 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
             let status = NCUtility.shared.getUserStatus(userIcon: sharee.userIcon, userStatus: sharee.userStatus, userMessage: sharee.userMessage)
             cell.imageStatus.image = status.onlineStatus
             cell.status.text = status.statusMessage
-            cell.user = sharee.shareWith
+            cell.fileUser = sharee.shareWith
             if cell.status.text?.count ?? 0 > 0 {
                 cell.centerTitle.constant = -5
             } else {
@@ -533,7 +533,7 @@ class NCShareUserDropDownCell: DropDownCell, NCCellProtocol {
     @IBOutlet weak var imageShareeType: UIImageView!
     @IBOutlet weak var centerTitle: NSLayoutConstraint!
     
-    var user: String = ""
+    private var user: String = ""
     
     var fileAvatarImageView: UIImageView? {
         get {
@@ -554,5 +554,8 @@ class NCShareUserDropDownCell: DropDownCell, NCCellProtocol {
         get {
             return user
         }
+        set {
+            user = newValue ?? ""
+        }
     }
 }

iOSClient/Transfers/NCTransferCell.swift

@@ -36,9 +36,10 @@ class NCTransferCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellP
     @IBOutlet weak var separator: UIView!
     @IBOutlet weak var separatorHeightConstraint: NSLayoutConstraint!
     
+    private var objectId = ""
+    private var user = ""
+    
     var delegate: NCTransferCellDelegate?
-    var objectId = ""
-    var user = ""
     var indexPath = IndexPath()
     var namedButtonMore = ""
     
@@ -51,6 +52,9 @@ class NCTransferCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellP
         get {
             return objectId
         }
+        set {
+            objectId = newValue ?? ""
+        }
     }
     var filePreviewImageView : UIImageView? {
         get {
@@ -58,9 +62,12 @@ class NCTransferCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellP
         }
     }
     var fileUser: String? {
-        get{
+        get {
             return user
         }
+        set {
+            user = newValue ?? ""
+        }
     }
     
     override func awakeFromNib() {

iOSClient/Transfers/NCTransfers.swift

@@ -174,8 +174,8 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate  {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "transferCell", for: indexPath) as! NCTransferCell
         cell.delegate = self
             
-        cell.objectId = metadata.ocId
-        cell.user = metadata.ownerId
+        cell.fileObjectId = metadata.ocId
+        cell.fileUser = metadata.ownerId
         cell.indexPath = indexPath
         
         cell.imageItem.image = nil

iOSClient/Trash/NCTrash.swift

@@ -337,7 +337,7 @@ extension NCTrash: UICollectionViewDataSource {
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "gridCell", for: indexPath) as! NCGridCell
             cell.delegate = self
             
-            cell.objectId = tableTrash.fileId
+            cell.fileObjectId = tableTrash.fileId
             cell.labelTitle.text = tableTrash.trashbinFileName
             cell.labelTitle.textColor = NCBrandColor.shared.label