marinofaggiana há 4 anos atrás
pai
commit
c62233becb

+ 1 - 1
File Provider Extension/FileProviderExtension+Actions.swift

@@ -206,7 +206,7 @@ extension FileProviderExtension {
                     
                     _ = fileProviderUtility.sharedInstance.moveFile(CCUtility.getDirectoryProviderStorageIconOcId(itemIdentifier.rawValue, etag: metadata.etag), toPath: CCUtility.getDirectoryProviderStorageIconOcId(itemIdentifier.rawValue, etag: metadata.etag))
                     
-                    NCManageDatabase.sharedInstance.setLocalFile(ocId: ocId, date: nil, exifDate: nil, exifLatitude: nil, exifLongitude: nil, fileName: itemName, etag: nil)
+                    NCManageDatabase.sharedInstance.setLocalFile(ocId: ocId, fileName: itemName, etag: nil)
                 }
                 
                 guard let parentItemIdentifier = fileProviderUtility.sharedInstance.getParentItemIdentifier(metadata: metadata, homeServerUrl: fileProviderData.sharedInstance.homeServerUrl) else {

+ 1 - 1
iOSClient/CCGlobal.h

@@ -79,7 +79,7 @@
 
 // Database Realm
 #define k_databaseDefault                               @"nextcloud.realm"
-#define k_databaseSchemaVersion                         141
+#define k_databaseSchemaVersion                         142
 
 // Intro selector
 #define k_intro_login                                   0

+ 2 - 2
iOSClient/Database/NCDatabase.swift

@@ -279,13 +279,13 @@ class tableGPS: Object {
 class tableLocalFile: Object {
     
     @objc dynamic var account = ""
-    @objc dynamic var date = NSDate()
     @objc dynamic var etag = ""
-    @objc dynamic var exifDate = NSDate()
+    @objc dynamic var exifDate: NSDate? = nil
     @objc dynamic var exifLatitude = ""
     @objc dynamic var exifLongitude = ""
     @objc dynamic var favorite: Bool = false
     @objc dynamic var fileName = ""
+    @objc dynamic var lastAccessDate: NSDate? = nil
     @objc dynamic var ocId = ""
     @objc dynamic var offline: Bool = false
     @objc dynamic var size: Double = 0

+ 15 - 14
iOSClient/Database/NCManageDatabase.swift

@@ -1490,7 +1490,6 @@ class NCManageDatabase: NSObject {
                 let addObject = tableLocalFile()
                 
                 addObject.account = metadata.account
-                addObject.date = metadata.date
                 addObject.etag = metadata.etag
                 addObject.exifDate = NSDate()
                 addObject.exifLatitude = "-1"
@@ -1520,25 +1519,13 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    @objc func setLocalFile(ocId: String, date: NSDate?, exifDate: NSDate?, exifLatitude: String?, exifLongitude: String?, fileName: String?, etag: String?) {
+    @objc func setLocalFile(ocId: String, fileName: String?, etag: String?) {
         
         let realm = try! Realm()
 
         do {
             try realm.safeWrite {
                 let result = realm.objects(tableLocalFile.self).filter("ocId == %@", ocId).first
-                if let date = date {
-                    result?.date = date
-                }
-                if let exifDate = exifDate {
-                    result?.exifDate = exifDate
-                }
-                if let exifLatitude = exifLatitude {
-                    result?.exifLatitude = exifLatitude
-                }
-                if let exifLongitude = exifLongitude {
-                    result?.exifLongitude = exifLongitude
-                }
                 if let fileName = fileName {
                     result?.fileName = fileName
                 }
@@ -1583,6 +1570,20 @@ class NCManageDatabase: NSObject {
             NCCommunicationCommon.shared.writeLog("Could not write to database: \(error)")
         }
     }
+    
+    @objc func setLocalFile(ocId: String, lastAccessDate: Date) {
+        
+        let realm = try! Realm()
+        
+        do {
+            try realm.safeWrite {
+                let result = realm.objects(tableLocalFile.self).filter("ocId == %@", ocId).first
+                result?.lastAccessDate = lastAccessDate as NSDate
+            }
+        } catch let error {
+            NCCommunicationCommon.shared.writeLog("Could not write to database: \(error)")
+        }
+    }
 
     //MARK: -
     //MARK: Table Metadata

+ 5 - 0
iOSClient/Main/NCCollectionCommon.swift

@@ -677,6 +677,11 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, NCL
         super.viewDidLoad()
         
         self.navigationController?.navigationBar.prefersLargeTitles = true
+        /*
+         let search = UISearchController(searchResultsController: nil)
+         search.searchResultsUpdater = self
+         self.navigationItem.searchController = search
+         */
         
         // Cell
         collectionView.register(UINib.init(nibName: "NCListCell", bundle: nil), forCellWithReuseIdentifier: "listCell")

+ 1 - 1
iOSClient/Networking/NCNetworking.swift

@@ -971,7 +971,7 @@ import Queuer
                             
                 } else {
                             
-                    NCManageDatabase.sharedInstance.setLocalFile(ocId: metadata.ocId, date: nil, exifDate: nil, exifLatitude: nil, exifLongitude: nil, fileName: fileNameNew, etag: nil)
+                    NCManageDatabase.sharedInstance.setLocalFile(ocId: metadata.ocId, fileName: fileNameNew, etag: nil)
                     // Move file system
                     let atPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId) + "/" + metadata.fileName
                     let toPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId) + "/" + fileNameNew

+ 2 - 1
iOSClient/Utility/CCExifGeo.m

@@ -112,9 +112,10 @@
     }
 
     // Wite data EXIF in TableLocalFile
+    /*
     if (tiff || gps)
         [[NCManageDatabase sharedInstance] setLocalFileWithOcId:metadata.ocId date:nil exifDate:date exifLatitude:stringLatitude exifLongitude:stringLongitude fileName:nil etag:nil];
-    
+    */
     CFRelease(originalSource);
     CFRelease(imageProperties);
 }