Browse Source

Revert "change obj db"

This reverts commit 35a6521f725380c7d9eaa0b4ab62d82817cc4b9c.
Marino Faggiana 2 years ago
parent
commit
7f39be7fff

+ 3 - 0
iOSClient/Data/NCManageDatabase+Share.swift

@@ -71,6 +71,9 @@ class tableShareV2: Object {
     override static func primaryKey() -> String {
         return "primaryKey"
     }
+}
+
+extension NCManageDatabase {
 
     func addShare(account: String, home: String, shares: [NKShare]) {
 

+ 1 - 1
iOSClient/Share/NCShare.swift

@@ -181,7 +181,7 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
 
     @objc func reloadData() {
         if let metadata = metadata {
-            shares = tableShare().getTableShares(metadata: metadata)
+            shares = NCManageDatabase.shared.getTableShares(metadata: metadata)
         }
         tableView.reloadData()
     }

+ 4 - 4
iOSClient/Share/NCShareNetworking.swift

@@ -56,7 +56,7 @@ class NCShareNetworking: NSObject {
 
             if error == .success, let shares = shares {
                 let home = NCUtilityFileSystem.shared.getHomeServer(urlBase: self.metadata.urlBase, userId: self.metadata.userId)
-                tableShare().addShare(account: self.metadata.account, home:home, shares: shares)
+                NCManageDatabase.shared.addShare(account: self.metadata.account, home:home, shares: shares)
             } else {
                 NCContentPresenter.shared.showError(error: error)
             }
@@ -80,7 +80,7 @@ class NCShareNetworking: NSObject {
             if error == .success, let share = share {
                 option.idShare = share.idShare
                 let home = NCUtilityFileSystem.shared.getHomeServer(urlBase: self.metadata.urlBase, userId: self.metadata.userId)
-                tableShare().addShare(account: self.metadata.account, home: home, shares: [share])
+                NCManageDatabase.shared.addShare(account: self.metadata.account, home: home, shares: [share])
                 if option.hasChanges(comparedTo: share) {
                     self.updateShare(option: option)
                 }
@@ -96,7 +96,7 @@ class NCShareNetworking: NSObject {
         NextcloudKit.shared.deleteShare(idShare: idShare) { account, error in
             NCActivityIndicator.shared.stop()
             if error == .success {
-                tableShare().deleteTableShare(account: account, idShare: idShare)
+                NCManageDatabase.shared.deleteTableShare(account: account, idShare: idShare)
                 self.delegate?.unShareCompleted()
             } else {
                 NCContentPresenter.shared.showError(error: error)
@@ -110,7 +110,7 @@ class NCShareNetworking: NSObject {
             NCActivityIndicator.shared.stop()
             if error == .success, let share = share {
                 let home = NCUtilityFileSystem.shared.getHomeServer(urlBase: self.metadata.urlBase, userId: self.metadata.userId)
-                tableShare().addShare(account: self.metadata.account, home: home, shares: [share])
+                NCManageDatabase.shared.addShare(account: self.metadata.account, home: home, shares: [share])
                 self.delegate?.readShareCompleted()
             } else {
                 NCContentPresenter.shared.showError(error: error)

+ 3 - 3
iOSClient/Shares/NCShares.swift

@@ -54,7 +54,7 @@ class NCShares: NCCollectionViewCommon {
         super.reloadDataSource()
 
         DispatchQueue.global().async {
-            let sharess = tableShare().getTableShares(account: self.appDelegate.account)
+            let sharess = NCManageDatabase.shared.getTableShares(account: self.appDelegate.account)
             var metadatas: [tableMetadata] = []
             for share in sharess {
                 if let metadata = NCManageDatabase.shared.getMetadata(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileName == %@", self.appDelegate.account, share.serverUrl, share.fileName)) {
@@ -96,10 +96,10 @@ class NCShares: NCCollectionViewCommon {
             self.isReloadDataSourceNetworkInProgress = false
 
             if error == .success {
-                tableShare().deleteTableShare(account: account)
+                NCManageDatabase.shared.deleteTableShare(account: account)
                 if let shares = shares, !shares.isEmpty {
                     let home = NCUtilityFileSystem.shared.getHomeServer(urlBase: self.appDelegate.urlBase, userId: self.appDelegate.userId)
-                    tableShare().addShare(account: self.appDelegate.account, home: home, shares: shares)
+                    NCManageDatabase.shared.addShare(account: self.appDelegate.account, home: home, shares: shares)
                 }
                 self.reloadDataSource()