瀏覽代碼

Removed the option "Favorite available offline", use the option "Set available offline"

marinofaggiana 4 年之前
父節點
當前提交
eea7eb6b15

+ 1 - 1
iOSClient/Brand/NCBrand.swift

@@ -276,7 +276,7 @@ class NCBrandColor: NSObject {
 
     // Database Realm
     let databaseDefault                             = "nextcloud.realm"
-    let databaseSchemaVersion: UInt64               = 160
+    let databaseSchemaVersion: UInt64               = 161
     
     // Intro selector
     @objc let introLogin: Int                       = 0

+ 0 - 1
iOSClient/Data/NCDatabase.swift

@@ -221,7 +221,6 @@ class tableDirectory: Object {
     @objc dynamic var permissions = ""
     @objc dynamic var richWorkspace: String?
     @objc dynamic var serverUrl = ""
-    @objc dynamic var synchronized: Bool = false
 
     override static func primaryKey() -> String {
         return "ocId"

+ 3 - 3
iOSClient/Data/NCManageDatabase.swift

@@ -1260,6 +1260,7 @@ class NCManageDatabase: NSObject {
         }
     }
     
+    /*
     @objc func setDirectory(synchronized: Bool, serverUrl: String, account: String) {
         
         let realm = try! Realm()
@@ -1299,7 +1300,8 @@ class NCManageDatabase: NSObject {
             NCCommunicationCommon.shared.writeLog("Could not write to database: \(error)")
         }
     }
-
+    */
+    
     //MARK: -
     //MARK: Table e2e Encryption
     
@@ -1937,8 +1939,6 @@ class NCManageDatabase: NSObject {
                         let table = realm.objects(tableDirectory.self).filter(NSPredicate(format: "ocId == %@", metadata.ocId)).first
                         if table?.etag != metadata.etag {
                             ocIdsUdate.append(metadata.ocId)
-                        } else if addDirectorySynchronized && table?.synchronized == false {
-                            ocIdsUdate.append(metadata.ocId)
                         }
                     }
                     

+ 1 - 5
iOSClient/Networking/NCNetworking.swift

@@ -1027,11 +1027,7 @@ import Queuer
             if errorCode == 0 && metadata.account == account {
                 
                 NCManageDatabase.shared.setMetadataFavorite(ocId: metadata.ocId, favorite: favorite)
-                if !favorite && metadata.directory {
-                    let serverUrl = metadata.serverUrl + "/" + metadata.fileName
-                    NCManageDatabase.shared.removeDirectoriesSynchronized(serverUrl: serverUrl, account: account)
-                }
-                
+               
                 #if !EXTENSION
                 if favorite {
                     NCOperationQueue.shared.synchronizationMetadata(metadata, selector: NCBrandGlobal.shared.selectorReadFile)

+ 2 - 8
iOSClient/Networking/NCOperationQueue.swift

@@ -266,7 +266,7 @@ class NCOperationSynchronization: ConcurrentOperation {
 
                 NCCommunication.shared.readFileOrFolder(serverUrlFileName: serverUrl, depth: "0", showHiddenFiles: CCUtility.getShowHiddenFiles()) { (account, files, responseData, errorCode, errorDescription) in
 
-                    if (errorCode == 0) && (directory?.etag != files.first?.etag || directory?.synchronized == false) {
+                    if (errorCode == 0) && (directory?.etag != files.first?.etag) {
                         
                         NCCommunication.shared.readFileOrFolder(serverUrlFileName: serverUrl, depth: "1", showHiddenFiles: CCUtility.getShowHiddenFiles()) { (account, files, responseData, errorCode, errorDescription) in
                             
@@ -309,8 +309,6 @@ class NCOperationSynchronization: ConcurrentOperation {
                                     
                                     // Update etag directory
                                     NCManageDatabase.shared.addDirectory(encrypted: metadataFolder.e2eEncrypted, favorite: metadataFolder.favorite, ocId: metadataFolder.ocId, fileId: metadataFolder.fileId, etag: metadataFolder.etag, permissions: metadataFolder.permissions, serverUrl: serverUrl, richWorkspace: metadataFolder.richWorkspace, account: metadataFolder.account)
-                                    // Update
-                                    NCManageDatabase.shared.setDirectory(synchronized: true, serverUrl: serverUrl, account: account)
                                 }
                             
                             } else if errorCode == NCBrandGlobal.shared.ErrorResourceNotFound && self.metadata.directory {
@@ -325,11 +323,7 @@ class NCOperationSynchronization: ConcurrentOperation {
                         let metadatas = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", account, serverUrl))
                         for metadata in metadatas {
                             if metadata.directory {
-                                let serverUrl = metadata.serverUrl + "/" + metadata.fileName
-                                let directory = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata.account, serverUrl))
-                                if directory?.synchronized == false {
-                                    NCOperationQueue.shared.synchronizationMetadata(metadata, selector: self.selector)
-                                }
+                                NCOperationQueue.shared.synchronizationMetadata(metadata, selector: self.selector)
                             } else {
                                 let localFile = NCManageDatabase.shared.getTableLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
                                 let fileSize = CCUtility.fileProviderStorageSize(metadata.ocId, fileNameView: metadata.fileNameView)