From d3268e4a7206444193a385d739b43cbd4bd337cb Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Mon, 3 Apr 2023 16:31:09 +0400 Subject: [PATCH] mobile: delete XFTP files after uploading (#2133) --- .../main/java/chat/simplex/app/model/SimpleXAPI.kt | 12 +++++++++++- apps/ios/Shared/Model/SimpleXAPI.swift | 6 ++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt b/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt index 554a900b59..90ff215dd3 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt @@ -1440,8 +1440,18 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a chatItemSimpleUpdate(r.user, r.chatItem) is CR.SndFileProgressXFTP -> chatItemSimpleUpdate(r.user, r.chatItem) - is CR.SndFileCompleteXFTP -> + is CR.SndFileCompleteXFTP -> { chatItemSimpleUpdate(r.user, r.chatItem) + val cItem = r.chatItem.chatItem + val mc = cItem.content.msgContent + val fileName = cItem.file?.fileName + if ( + mc is MsgContent.MCFile + && fileName != null + ) { + removeFile(appContext, fileName) + } + } is CR.CallInvitation -> { chatModel.callManager.reportNewIncomingCall(r.callInvitation) } diff --git a/apps/ios/Shared/Model/SimpleXAPI.swift b/apps/ios/Shared/Model/SimpleXAPI.swift index 54d78810f9..7f81bc5108 100644 --- a/apps/ios/Shared/Model/SimpleXAPI.swift +++ b/apps/ios/Shared/Model/SimpleXAPI.swift @@ -1359,6 +1359,12 @@ func processReceivedMsg(_ res: ChatResponse) async { chatItemSimpleUpdate(user, aChatItem) case let .sndFileCompleteXFTP(user, aChatItem, _): chatItemSimpleUpdate(user, aChatItem) + let cItem = aChatItem.chatItem + let mc = cItem.content.msgContent + if case .file = mc, + let fileName = cItem.file?.filePath { + removeFile(fileName) + } case let .callInvitation(invitation): m.callInvitations[invitation.contact.id] = invitation activateCall(invitation)