Revert "change obj db"

This reverts commit 510256ee8dbc40300426617a4ca109578e2774bd.

iOSClient/Data/NCManageDatabase+Avatar.swift

@@ -35,6 +35,9 @@ class tableAvatar: Object {
     override static func primaryKey() -> String {
         return "fileName"
     }
+}
+
+extension NCManageDatabase {
 
     func addAvatar(fileName: String, etag: String) {
 

iOSClient/Networking/NCOperationQueue.swift

@@ -188,7 +188,7 @@ import NextcloudKit
 
         let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + fileName
 
-        if let image = tableAvatar().getImageAvatarLoaded(fileName: fileName) {
+        if let image = NCManageDatabase.shared.getImageAvatarLoaded(fileName: fileName) {
             cellImageView?.image = image
             cell.fileAvatarImageView?.image = image
             return
@@ -561,7 +561,7 @@ class NCOperationDownloadAvatar: ConcurrentOperation {
         self.fileNameLocalPath = fileNameLocalPath
         self.cell = cell
         self.view = view
-        self.etag = tableAvatar().getTableAvatar(fileName: fileName)?.etag
+        self.etag = NCManageDatabase.shared.getTableAvatar(fileName: fileName)?.etag
         self.cellImageView = cellImageView
     }
 
@@ -576,7 +576,7 @@ class NCOperationDownloadAvatar: ConcurrentOperation {
             NextcloudKit.shared.downloadAvatar(user: user, fileNameLocalPath: fileNameLocalPath, sizeImage: NCGlobal.shared.avatarSize, avatarSizeRounded: NCGlobal.shared.avatarSizeRounded, etag: self.etag, options: options) { _, imageAvatar, _, etag, error in
 
                 if error == .success, let imageAvatar = imageAvatar, let etag = etag {
-                    tableAvatar().addAvatar(fileName: self.fileName, etag: etag)
+                    NCManageDatabase.shared.addAvatar(fileName: self.fileName, etag: etag)
                     DispatchQueue.main.async {
                         if self.user == self.cell.fileUser, let avatarImageView = self.cellImageView {
                             UIView.transition(with: avatarImageView,
@@ -593,7 +593,7 @@ class NCOperationDownloadAvatar: ConcurrentOperation {
                         }
                     }
                 } else if error.errorCode == NCGlobal.shared.errorNotModified {
-                    tableAvatar().setAvatarLoaded(fileName: self.fileName)
+                    NCManageDatabase.shared.setAvatarLoaded(fileName: self.fileName)
                 }
                 self.finish()
             }

iOSClient/Networking/NCService.swift

@@ -38,7 +38,7 @@ class NCService: NSObject {
 
     @objc public func startRequestServicesServer() {
 
-        tableAvatar().clearAllAvatarLoaded()
+        NCManageDatabase.shared.clearAllAvatarLoaded()
         guard !appDelegate.account.isEmpty else { return }
 
         addInternalTypeIdentifier()
@@ -143,17 +143,17 @@ class NCService: NSObject {
             // Get Avatar
             let fileName = tableAccount.userBaseUrl + "-" + self.appDelegate.user + ".png"
             let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + fileName
-            let etag = tableAvatar().getTableAvatar(fileName: fileName)?.etag
+            let etag = NCManageDatabase.shared.getTableAvatar(fileName: fileName)?.etag
             let options = NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)
 
             NextcloudKit.shared.downloadAvatar(user: tableAccount.userId, fileNameLocalPath: fileNameLocalPath, sizeImage: NCGlobal.shared.avatarSize, avatarSizeRounded: NCGlobal.shared.avatarSizeRounded, etag: etag, options: options) { _, _, _, etag, error in
                 guard let etag = etag, error == .success else {
                     if error.errorCode == NCGlobal.shared.errorNotModified {
-                        tableAvatar().setAvatarLoaded(fileName: fileName)
+                        NCManageDatabase.shared.setAvatarLoaded(fileName: fileName)
                     }
                     return
                 }
-                tableAvatar().addAvatar(fileName: fileName, etag: etag)
+                NCManageDatabase.shared.addAvatar(fileName: fileName, etag: etag)
                 NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadAvatar, userInfo: nil)
             }
 

iOSClient/Share/NCShare.swift

@@ -150,9 +150,9 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
 
         let fileName = appDelegate.userBaseUrl + "-" + metadata.ownerId + ".png"
 
-        if tableAvatar().getImageAvatarLoaded(fileName: fileName) == nil {
+        if NCManageDatabase.shared.getImageAvatarLoaded(fileName: fileName) == nil {
             let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + fileName
-            let etag = tableAvatar().getTableAvatar(fileName: fileName)?.etag
+            let etag = NCManageDatabase.shared.getTableAvatar(fileName: fileName)?.etag
 
             NextcloudKit.shared.downloadAvatar(
                 user: metadata.ownerId,
@@ -161,9 +161,9 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
                 avatarSizeRounded: NCGlobal.shared.avatarSizeRounded,
                 etag: etag) { _, imageAvatar, _, etag, error in
                     if error == .success, let etag = etag, let imageAvatar = imageAvatar {
-                        tableAvatar().addAvatar(fileName: fileName, etag: etag)
+                        NCManageDatabase.shared.addAvatar(fileName: fileName, etag: etag)
                         self.sharedWithYouByImage.image = imageAvatar
-                    } else if error.errorCode == NCGlobal.shared.errorNotModified, let imageAvatar = tableAvatar().setAvatarLoaded(fileName: fileName) {
+                    } else if error.errorCode == NCGlobal.shared.errorNotModified, let imageAvatar = NCManageDatabase.shared.setAvatarLoaded(fileName: fileName) {
                         self.sharedWithYouByImage.image = imageAvatar
                     }
                 }

iOSClient/Share/NCShareUserCell.swift

@@ -159,9 +159,9 @@ class NCSearchUserDropDownCell: DropDownCell, NCCellProtocol {
                userBaseUrl: baseUrl)
 
         let fileName = baseUrl.userBaseUrl + "-" + sharee.shareWith + ".png"
-        if tableAvatar().getImageAvatarLoaded(fileName: fileName) == nil {
+        if NCManageDatabase.shared.getImageAvatarLoaded(fileName: fileName) == nil {
             let fileNameLocalPath = String(CCUtility.getDirectoryUserData()) + "/" + fileName
-            let etag = tableAvatar().getTableAvatar(fileName: fileName)?.etag
+            let etag = NCManageDatabase.shared.getTableAvatar(fileName: fileName)?.etag
 
             NextcloudKit.shared.downloadAvatar(
                 user: sharee.shareWith,
@@ -171,9 +171,9 @@ class NCSearchUserDropDownCell: DropDownCell, NCCellProtocol {
                 etag: etag) { _, imageAvatar, _, etag, error in
 
                     if error == .success, let etag = etag, let imageAvatar = imageAvatar {
-                        tableAvatar().addAvatar(fileName: fileName, etag: etag)
+                        NCManageDatabase.shared.addAvatar(fileName: fileName, etag: etag)
                         self.imageItem.image = imageAvatar
-                    } else if error.errorCode == NCGlobal.shared.errorNotModified, let imageAvatar = tableAvatar().setAvatarLoaded(fileName: fileName) {
+                    } else if error.errorCode == NCGlobal.shared.errorNotModified, let imageAvatar = NCManageDatabase.shared.setAvatarLoaded(fileName: fileName) {
                         self.imageItem.image = imageAvatar
                     }
                 }

iOSClient/Utility/NCUtility.swift

@@ -450,7 +450,7 @@ class NCUtility: NSObject {
 
         if let localImage = UIImage(contentsOfFile: localFilePath) {
             return createAvatar(image: localImage, size: 30)
-        } else if let loadedAvatar = tableAvatar().getImageAvatarLoaded(fileName: fileName) {
+        } else if let loadedAvatar = NCManageDatabase.shared.getImageAvatarLoaded(fileName: fileName) {
             return loadedAvatar
         } else if let displayName = displayName, !displayName.isEmpty, let avatarImg = createAvatar(displayName: displayName, size: 30) {
             return avatarImg