From 7f800b00a0736c43371fa416ff220e5ca40ace9d Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Thu, 19 Nov 2020 14:34:52 +0100 Subject: [PATCH] SPARK-2207: Display correct name for received file When a file is received, it could be renamed (see SPARK-2198). The name that's displayed in the confirmation text needs to be modified accordingly. --- .../plugin/filetransfer/transfer/ui/ReceiveFileTransfer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveFileTransfer.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveFileTransfer.java index 5eabb9161..4b4c57f2d 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveFileTransfer.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveFileTransfer.java @@ -498,7 +498,7 @@ public class ReceiveFileTransfer extends JPanel { transferMessage = Res.getString("message.transfer.cancelled"); saveEventToHistory(Res.getString("message.file.transfer.history.receive.canceled", fileName, nickname)); } else if (transfer.getAmountWritten() >= request.getFileSize()) { - transferMessage = Res.getString("message.transfer.complete", transfer.getFileName()); + transferMessage = Res.getString("message.transfer.complete", downloadedFile.getName()); // TODO this overwrites the message that was set by transferDone saveEventToHistory(Res.getString("message.file.transfer.history.receive.success", fileName, nickname)); }