Swiftdiff options
| author | Alex Clayton <alex.clayton@isode.com> | 2016-03-15 10:55:56 (GMT) |
|---|---|---|
| committer | Alex Clayton <alex.clayton@isode.com> | 2016-03-15 14:14:06 (GMT) |
| commit | 3205cbf499196b32379c66cb0bea4ccd77334210 (patch) | |
| tree | f888751ed02d990d3b3a63906329d4c6992117b3 /src/com | |
| parent | 826bc53ab9839d4f6dff28cdb4d5dc1b317016de (diff) | |
| download | stroke-3205cbf499196b32379c66cb0bea4ccd77334210.zip stroke-3205cbf499196b32379c66cb0bea4ccd77334210.tar.bz2 | |
Add description to FileTransfer
As per patch 'Show file-transfer description if provided'
(523dbfb769069663eda19e381ad35f466b1ef27c) add a description field to
the FileTransfer interface and its implementations.
Test-information: Unit test still pass ok.
Change-Id: I146e2adce67a491ae0381154e54d6d0e480026a2
Diffstat (limited to 'src/com')
3 files changed, 23 insertions, 5 deletions
diff --git a/src/com/isode/stroke/filetransfer/FileTransfer.java b/src/com/isode/stroke/filetransfer/FileTransfer.java index e12b07d..f3e7bba 100644 --- a/src/com/isode/stroke/filetransfer/FileTransfer.java +++ b/src/com/isode/stroke/filetransfer/FileTransfer.java @@ -65,3 +65,3 @@ public interface FileTransfer { - public void setFileInfo(final String name, long size); + public void setFileInfo(final String name, long size, String description); @@ -69,2 +69,4 @@ public interface FileTransfer { + public String getDescription(); + } diff --git a/src/com/isode/stroke/filetransfer/IncomingJingleFileTransfer.java b/src/com/isode/stroke/filetransfer/IncomingJingleFileTransfer.java index f7f9c70..60cde19 100644 --- a/src/com/isode/stroke/filetransfer/IncomingJingleFileTransfer.java +++ b/src/com/isode/stroke/filetransfer/IncomingJingleFileTransfer.java @@ -34,2 +34,3 @@ import com.isode.stroke.signals.Slot1; import com.isode.stroke.signals.Slot; + import java.util.logging.Logger; @@ -43,2 +44,3 @@ public class IncomingJingleFileTransfer extends JingleFileTransfer implements In private String filename = ""; //FileTransferVariables + private String ft_description = ""; //FileTransferVariables @@ -64,5 +66,6 @@ public class IncomingJingleFileTransfer extends JingleFileTransfer implements In @Override - public void setFileInfo(final String name, long size) { + public void setFileInfo(final String name, long size, String description) { this.filename = name; this.fileSizeInBytes = size; + this.ft_description = description; } @@ -101,3 +104,3 @@ public class IncomingJingleFileTransfer extends JingleFileTransfer implements In JingleFileTransferFileInfo fileInfo = description.getFileInfo(); - setFileInfo(fileInfo.getName(), fileInfo.getSize()); + setFileInfo(fileInfo.getName(), fileInfo.getSize(), fileInfo.getDescription()); hashes = fileInfo.getHashes(); @@ -503,2 +506,7 @@ public class IncomingJingleFileTransfer extends JingleFileTransfer implements In } + + @Override + public String getDescription() { + return ft_description; + } }
\ No newline at end of file diff --git a/src/com/isode/stroke/filetransfer/OutgoingJingleFileTransfer.java b/src/com/isode/stroke/filetransfer/OutgoingJingleFileTransfer.java index 63a11e8..f32821b 100644 --- a/src/com/isode/stroke/filetransfer/OutgoingJingleFileTransfer.java +++ b/src/com/isode/stroke/filetransfer/OutgoingJingleFileTransfer.java @@ -39,2 +39,3 @@ import com.isode.stroke.signals.Slot1; import com.isode.stroke.signals.Slot; + import java.util.logging.Logger; @@ -46,2 +47,3 @@ public class OutgoingJingleFileTransfer extends JingleFileTransfer implements Ou private String filename = ""; //FileTransferVariables + private String ft_description = ""; // FileTransferVariables @@ -67,5 +69,6 @@ public class OutgoingJingleFileTransfer extends JingleFileTransfer implements Ou @Override - public void setFileInfo(final String name, long size) { + public void setFileInfo(final String name, long size, String description) { this.filename = name; this.fileSizeInBytes = size; + this.ft_description = description; } @@ -107,3 +110,3 @@ public class OutgoingJingleFileTransfer extends JingleFileTransfer implements Ou this.candidateAcknowledged = false; - setFileInfo(fileInfo.getName(), fileInfo.getSize()); + setFileInfo(fileInfo.getName(), fileInfo.getSize(), fileInfo.getDescription()); @@ -451,2 +454,7 @@ public class OutgoingJingleFileTransfer extends JingleFileTransfer implements Ou + @Override + public String getDescription() { + return ft_description; + } + }
\ No newline at end of file |