marinofaggiana 5 жил өмнө
parent
commit
67de450e82

+ 1 - 1
iOSClient/CCGlobal.h

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

+ 2 - 0
iOSClient/Database/NCDatabase.swift

@@ -340,6 +340,7 @@ class tableMedia: Object {
     @objc dynamic var date = NSDate()
     @objc dynamic var directory: Bool = false
     @objc dynamic var e2eEncrypted: Bool = false
+    @objc dynamic var edited: Bool = false
     @objc dynamic var etag = ""
     @objc dynamic var favorite: Bool = false
     @objc dynamic var fileId = ""
@@ -382,6 +383,7 @@ class tableMetadata: Object {
     @objc dynamic var date = NSDate()
     @objc dynamic var directory: Bool = false
     @objc dynamic var e2eEncrypted: Bool = false
+    @objc dynamic var edited: Bool = false
     @objc dynamic var etag = ""
     @objc dynamic var favorite: Bool = false
     @objc dynamic var fileId = ""

+ 1 - 1
iOSClient/Main/NCMainCommon.swift

@@ -1437,7 +1437,7 @@ class NCNetworkingMain: NSObject, CCNetworkingDelegate {
             return
         }
         
-        if metadata.typeFile == k_metadataTypeFile_imagemeter {
+        if metadata.edited {
             NCMainCommon.sharedInstance.reloadDatasource(ServerUrl: serverUrl, ocId: nil, action: Int32(k_action_NULL))
         } else {
             NCMainCommon.sharedInstance.reloadDatasource(ServerUrl: serverUrl, ocId: ocId, action: Int32(k_action_MOD))

+ 4 - 6
iOSClient/Networking/CCNetworking.m

@@ -1042,9 +1042,7 @@
     NSString *tempSession = metadata.session;
     NSString *errorMessage = @"";
     BOOL isE2EEDirectory = false;
-    BOOL isIMIFile = false;
-    if ([fileName.pathExtension.lowercaseString isEqualToString:@"imi"]) isIMIFile = true;
-    
+
     tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountWithPredicate:[NSPredicate predicateWithFormat:@"account == %@", metadata.account]];
     if (tableAccount == nil) {
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"ocId == %@", tempocId]];
@@ -1105,8 +1103,8 @@
         
     } else {
     
-        // remove tempocId and adjust the directory provider storage
-        if (isIMIFile) {
+        // Edited file, remove tempocId and adjust the directory provider storage
+        if (metadata.edited) {
             
             // Update metadata tempocId
             [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionTaskIdentifier:k_taskIdentifierDone status:k_metadataStatusNormal predicate:[NSPredicate predicateWithFormat:@"ocId == %@", tempocId]];
@@ -1193,7 +1191,7 @@
  #endif
         
         // Add Local or Remove from cache
-        if ([CCUtility getDisableLocalCacheAfterUpload] && !isIMIFile) {
+        if ([CCUtility getDisableLocalCacheAfterUpload] && !metadata.edited) {
             [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryProviderStorageOcId:metadata.ocId] error:nil];
         } else {
             // Add Local