dev

iOSClient/Main/CCDetail.m

@@ -689,7 +689,7 @@
             
             tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID == %@", fileID]];
             if (metadata) {
-                [[CCExifGeo sharedInstance] setExifLocalTableEtag:metadata directoryUser:appDelegate.directoryUser activeAccount:appDelegate.activeAccount];
+                [[CCExifGeo sharedInstance] setExifLocalTableEtag:metadata];
             }
         }
         

iOSClient/Networking/CCNetworking.m

@@ -665,7 +665,7 @@
         [[NCManageDatabase sharedInstance] addLocalFileWithMetadata:metadata];
             
         if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image])
-            [[CCExifGeo sharedInstance] setExifLocalTableEtag:metadata directoryUser:_directoryUser activeAccount:_activeAccount];
+            [[CCExifGeo sharedInstance] setExifLocalTableEtag:metadata];
 
         // E2EE Decrypted
         tableE2eEncryption *object = [[NCManageDatabase sharedInstance] getE2eEncryptionWithPredicate:[NSPredicate predicateWithFormat:@"fileNameIdentifier == %@ AND serverUrl == %@", fileName, serverUrl]];
@@ -1065,7 +1065,7 @@
         
         // EXIF
         if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image])
-            [[CCExifGeo sharedInstance] setExifLocalTableEtag:metadata directoryUser:_directoryUser activeAccount:_activeAccount];
+            [[CCExifGeo sharedInstance] setExifLocalTableEtag:metadata];
         
         // Create ICON
         if (metadata.directory == NO)

iOSClient/Utility/CCExifGeo.h

@@ -32,7 +32,7 @@
 
 + (CCExifGeo *)sharedInstance;
 
-- (void)setExifLocalTableEtag:(tableMetadata *)metadata directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount;
+- (void)setExifLocalTableEtag:(tableMetadata *)metadata;
 - (void)setGeocoderEtag:(NSString *)fileID exifDate:(NSDate *)exifDate latitude:(NSString*)latitude longitude:(NSString*)longitude;
 
 @end

iOSClient/Utility/CCExifGeo.m

@@ -22,6 +22,7 @@
 //
 
 #import "CCExifGeo.h"
+#import "CCUtility.h"
 #import "NCBridgeSwift.h"
 
 @implementation CCExifGeo
@@ -40,7 +41,7 @@
     }
 }
 
-- (void)setExifLocalTableEtag:(tableMetadata *)metadata directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount
+- (void)setExifLocalTableEtag:(tableMetadata *)metadata
 {
     NSString *dateTime;
     NSString *latitudeRef;
@@ -53,10 +54,10 @@
     
     NSDate *date = [NSDate new];
     
-    if (![[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", directoryUser, metadata.fileID]])
+    if (![[NSFileManager defaultManager] fileExistsAtPath:[CCUtility getDirectoryProviderStorageFileID:metadata.fileID fileNameView:metadata.fileNameView]])
         return;
 
-    NSURL *url = [NSURL fileURLWithPath:[NSString stringWithFormat:@"%@/%@", directoryUser, metadata.fileID]];
+    NSURL *url = [NSURL fileURLWithPath:[CCUtility getDirectoryProviderStorageFileID:metadata.fileID fileNameView:metadata.fileNameView]];
 
     CGImageSourceRef originalSource =  CGImageSourceCreateWithURL((CFURLRef) url, NULL);
     if (!originalSource)