coding

iOSClient/Activity/NCActivity.swift

@@ -108,7 +108,7 @@ class NCActivity: UIViewController, NCEmptyDataSetDelegate {
     }
 }
 
-class activityTableViewCell: UITableViewCell {
+class activityTableViewCell: UITableViewCell, NCCellProtocol {
     
     private let appDelegate = UIApplication.shared.delegate as! AppDelegate
 
@@ -120,6 +120,17 @@ class activityTableViewCell: UITableViewCell {
     @IBOutlet weak var subjectTrailingConstraint: NSLayoutConstraint!
     @IBOutlet weak var collectionViewHeightConstraint: NSLayoutConstraint!
 
+    var filePreviewImageView: UIImageView? {
+        get {
+            return nil
+        }
+    }
+    var avatarImageView: UIImageView? {
+        get{
+            return avatar
+        }
+    }
+    
     var idActivity: Int = 0
     var account: String = ""
     var activityPreviews: [tableActivityPreview] = []

iOSClient/Main/Collection Common/NCGridCell.swift

@@ -38,9 +38,14 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
     @IBOutlet weak var imageVisualEffect: UIVisualEffectView!
     @IBOutlet weak var progressView: UIProgressView!
 
-    var filePreviewImageView : UIImageView {
+    var filePreviewImageView: UIImageView? {
         get{
-         return imageItem
+            return imageItem
+        }
+    }
+    var avatarImageView: UIImageView? {
+        get{
+            return nil
         }
     }
     

iOSClient/Main/Collection Common/NCListCell.swift

@@ -48,12 +48,17 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
     @IBOutlet weak var separator: UIView!
     @IBOutlet weak var separatorHeightConstraint: NSLayoutConstraint!
 
-    var filePreviewImageView : UIImageView {
+    var filePreviewImageView : UIImageView? {
         get{
-         return imageItem
+            return imageItem
         }
     }
-
+    var avatarImageView: UIImageView? {
+        get{
+            return imageShared
+        }
+    }
+    
     var delegate: NCListCellDelegate?
     var objectId = ""
     var indexPath = IndexPath()

iOSClient/Main/NCCellProtocol.swift

@@ -24,5 +24,7 @@
 import UIKit
 
 protocol NCCellProtocol {
-    var filePreviewImageView: UIImageView {get}
+    var filePreviewImageView: UIImageView? { get }
+    var avatarImageView: UIImageView? { get }
 }
+

iOSClient/Media/Cell/NCGridMediaCell.swift

@@ -34,11 +34,16 @@ class NCGridMediaCell: UICollectionViewCell, NCCellProtocol {
     
     var date: Date?
 
-    var filePreviewImageView: UIImageView {
+    var filePreviewImageView: UIImageView? {
         get {
             return imageItem
         }
     }
+    var avatarImageView: UIImageView? {
+        get{
+            return nil
+        }
+    }
     
     override func awakeFromNib() {
         super.awakeFromNib()

iOSClient/Networking/NCOperationQueue.swift

@@ -412,7 +412,7 @@ class NCOperationDownloadThumbnail: ConcurrentOperation {
                     }
                 }
                 
-                if (cell != nil) {
+                if let filePreviewImageView = cell!.filePreviewImageView  {
                     var previewImage: UIImage!
                     if errorCode == 0 && imageIcon != nil {
                         previewImage = imageIcon
@@ -423,11 +423,10 @@ class NCOperationDownloadThumbnail: ConcurrentOperation {
                             previewImage = UIImage(named: "file")
                         }
                     }
-                    cell!.filePreviewImageView.backgroundColor = nil
-                    UIView.transition(with: cell!.filePreviewImageView,
+                    UIView.transition(with: filePreviewImageView,
                         duration: 0.75,
                         options: .transitionCrossDissolve,
-                        animations: { cell!.filePreviewImageView.image = previewImage! },
+                        animations: { filePreviewImageView.image = previewImage! },
                         completion: nil)
                 }
                 self.finish()

iOSClient/Transfers/NCTransferCell.swift

@@ -40,9 +40,14 @@ class NCTransferCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellP
     @IBOutlet weak var separator: UIView!
     @IBOutlet weak var separatorHeightConstraint: NSLayoutConstraint!
     
-    var filePreviewImageView : UIImageView {
+    var filePreviewImageView : UIImageView? {
         get{
-         return imageItem
+            return imageItem
+        }
+    }
+    var avatarImageView: UIImageView? {
+        get{
+            return nil
         }
     }