marinofaggiana 4 anni fa
parent
commit
ffb593a950

+ 2 - 2
iOSClient/Main/NCDetailViewController.swift

@@ -763,8 +763,8 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
                 
             } else {
                 
-                let serverUrlFileName = metadata.serverUrl + "/" + metadata.fileName
-                let fileNameLocalPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileName)!
+                let serverUrlFileName = metadata.serverUrl + "/" + metadata.fileNameView
+                let fileNameLocalPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
                                 
                 _ = NCCommunication.sharedInstance.download(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, account: metadata.account, progressHandler: { (progress) in
                                     

+ 2 - 2
iOSClient/Utility/CCUtility.m

@@ -1437,7 +1437,7 @@
         
     } else {
        
-        tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account == %@  AND serverUrl == %@", account, serverUrl]];
+        tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@", account, serverUrl]];
         
         while (directory != nil) {
             if (directory.e2eEncrypted == true) {
@@ -1446,7 +1446,7 @@
             NSURL *url = [NSURL URLWithString:serverUrl];
             serverUrl = [url URLByDeletingLastPathComponent].absoluteString;
             serverUrl = [serverUrl substringToIndex:[serverUrl length]-1];
-            directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account == %@  AND serverUrl == %@", account, serverUrl]];
+            directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@", account, serverUrl]];
         }
         
         return false;