Reoder file deletion to be more future proof on errors

tmolitor-stud-tu · tmolitor-stud-tu · commit c95dfaa9fd64 · 2026-02-26T02:10:44.000+01:00
diff --git a/Monal/Classes/MLFiletransfer.m b/Monal/Classes/MLFiletransfer.m
@@ -500,15 +500,17 @@ +(void) deleteFileForMessage:(MLMessage*) msg
 {
     if(![msg.messageType isEqualToString:kMessageTypeFiletransfer])
         return;
-    DDLogInfo(@"Deleting file for url %@", msg.messageText);
     MLFiletransferInfo* info = msg.fileInfo;
-    DDLogDebug(@"Deleting file in cache: %@", info.cacheFilePath);
-    [_fileManager removeItemAtPath:info.cacheFilePath error:nil];
+    if(info.downloadState < DownloadStateComplete)
+        return;
+    DDLogInfo(@"Deleting file for url %@", msg.messageText);
     if([info.mimeType hasPrefix:@"video/"])
     {
         DDLogVerbose(@"Deleting video thumbnail stored at %@", msg.fileInfo.thumbnailURL.path);
         [_fileManager removeItemAtPath:msg.fileInfo.thumbnailURL.path error:nil];
     }
+    DDLogDebug(@"Deleting file in cache: %@", info.cacheFilePath);
+    [_fileManager removeItemAtPath:info.cacheFilePath error:nil];
 }
 
 +(MLHandler*) prepareDataUpload:(NSData*) data

Original file line number	Diff line number	Diff line change
`@@ -500,15 +500,17 @@ +(void) deleteFileForMessage:(MLMessage*) msg`
`500`	`500`	`{`
`501`	`501`	`if(![msg.messageType isEqualToString:kMessageTypeFiletransfer])`
`502`	`502`	`return;`
`503`		`- DDLogInfo(@"Deleting file for url %@", msg.messageText);`
`504`	`503`	`MLFiletransferInfo* info = msg.fileInfo;`
`505`		`- DDLogDebug(@"Deleting file in cache: %@", info.cacheFilePath);`
`506`		`- [_fileManager removeItemAtPath:info.cacheFilePath error:nil];`
	`504`	`+ if(info.downloadState < DownloadStateComplete)`
	`505`	`+ return;`
	`506`	`+ DDLogInfo(@"Deleting file for url %@", msg.messageText);`
`507`	`507`	`if([info.mimeType hasPrefix:@"video/"])`
`508`	`508`	`{`
`509`	`509`	`DDLogVerbose(@"Deleting video thumbnail stored at %@", msg.fileInfo.thumbnailURL.path);`
`510`	`510`	`[_fileManager removeItemAtPath:msg.fileInfo.thumbnailURL.path error:nil];`
`511`	`511`	`}`
	`512`	`+ DDLogDebug(@"Deleting file in cache: %@", info.cacheFilePath);`
	`513`	`+ [_fileManager removeItemAtPath:info.cacheFilePath error:nil];`
`512`	`514`	`}`
`513`	`515`
`514`	`516`	`+(MLHandler) prepareDataUpload:(NSData) data`