From ef23aad7b2e66ff5c6104db9bb47fc233976c4b5 Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@fsfe.org>
Date: Sun, 13 Aug 2017 14:38:53 +0200
Subject: [PATCH] Improve jft api

---
 .../smackx/jft/JingleFileTransferManager.java       |  8 ++++++++
 .../jft/component/AbstractJingleFileOffer.java      |  3 +++
 .../jft/component/AbstractJingleFileRequest.java    |  2 ++
 .../jft/component/JingleIncomingFileOffer.java      |  6 ++++++
 .../jft/component/JingleIncomingFileRequest.java    |  5 +++++
 .../jft/component/JingleOutgoingFileOffer.java      |  5 +++++
 .../jft/component/JingleOutgoingFileRequest.java    |  5 +++++
 .../smackx/jft/component/file/LocalFile.java        | 13 +++++++++++--
 .../jft/controller/IncomingFileOfferController.java |  2 +-
 .../controller/JingleFileTransferController.java    |  2 ++
 10 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java
index 4988f5683..b8c9d0b7c 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java
@@ -92,7 +92,12 @@ public final class JingleFileTransferManager extends Manager implements JingleDe
     public OutgoingFileOfferController sendFile(File file, FullJid to)
             throws SmackException.NotConnectedException, InterruptedException, XMPPException.XMPPErrorException,
             SmackException.NoResponseException, SmackException.FeatureNotSupportedException {
+            return sendFile(file, null, to);
+    }
 
+    public OutgoingFileOfferController sendFile(File file, String alternativeFilename, FullJid to)
+            throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException,
+            SmackException.NoResponseException, SmackException.FeatureNotSupportedException {
         if (file == null || !file.exists()) {
             throw new IllegalArgumentException("File MUST NOT be null and MUST exist.");
         }
@@ -107,6 +112,9 @@ public final class JingleFileTransferManager extends Manager implements JingleDe
         session.addContent(content);
 
         JingleOutgoingFileOffer offer = new JingleOutgoingFileOffer(file);
+        if (alternativeFilename != null) {
+            offer.getFile().setName(alternativeFilename);
+        }
         content.setDescription(offer);
 
         JingleTransportManager transportManager = jingleManager.getBestAvailableTransportManager(to);
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileOffer.java
index 8420a548a..9711f8ee6 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileOffer.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileOffer.java
@@ -26,4 +26,7 @@ public abstract class AbstractJingleFileOffer<D extends AbstractJingleFileTransf
     public AbstractJingleFileOffer(D fileTransferFile) {
         super(fileTransferFile);
     }
+
+    @Override
+    public abstract D getFile();
 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileRequest.java
index 7b38dd428..94cafa493 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileRequest.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileRequest.java
@@ -27,4 +27,6 @@ public abstract class AbstractJingleFileRequest<D extends AbstractJingleFileTran
         super(fileTransferFile);
     }
 
+    @Override
+    public abstract D getFile();
 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileOffer.java
index df5da5ad5..9fd9625bc 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileOffer.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileOffer.java
@@ -37,6 +37,7 @@ import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionInfoElemen
 import org.jivesoftware.smackx.jingle.element.JingleElement;
 
 /**
+ * Behind the scenes logic of an incoming Jingle file offer.
  * Created by vanitas on 26.07.17.
  */
 public class JingleIncomingFileOffer extends AbstractJingleFileOffer<RemoteFile> implements IncomingFileOfferController {
@@ -130,4 +131,9 @@ public class JingleIncomingFileOffer extends AbstractJingleFileOffer<RemoteFile>
 
         return null;
     }
+
+    @Override
+    public RemoteFile getFile() {
+        return (RemoteFile) this.file;
+    }
 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileRequest.java
index c07d633b6..9e2dd6bb7 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileRequest.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileRequest.java
@@ -58,4 +58,9 @@ public class JingleIncomingFileRequest extends AbstractJingleFileRequest<RemoteF
     public void onBytestreamReady(BytestreamSession bytestreamSession) {
 
     }
+
+    @Override
+    public RemoteFile getFile() {
+        return (RemoteFile) file;
+    }
 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileOffer.java
index a9af3da99..c24edbab8 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileOffer.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileOffer.java
@@ -87,4 +87,9 @@ public class JingleOutgoingFileOffer extends AbstractJingleFileOffer<LocalFile>
     public boolean isRequest() {
         return false;
     }
+
+    @Override
+    public LocalFile getFile() {
+        return (LocalFile) file;
+    }
 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileRequest.java
index e930e4a25..e77f0b4a7 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileRequest.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileRequest.java
@@ -31,6 +31,11 @@ public class JingleOutgoingFileRequest extends AbstractJingleFileRequest<RemoteF
         super(file);
     }
 
+    @Override
+    public RemoteFile getFile() {
+        return (RemoteFile) file;
+    }
+
     @Override
     public JingleElement handleDescriptionInfo(JingleContentDescriptionInfoElement info) {
         return null;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/LocalFile.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/LocalFile.java
index 4fae81e62..b01abee66 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/LocalFile.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/LocalFile.java
@@ -27,6 +27,7 @@ import org.jivesoftware.smackx.hashes.element.HashElement;
 public class LocalFile extends AbstractJingleFileTransferFile {
 
     private File file;
+    private String name;
     private String description;
     private String mediaType;
     private HashElement hashElement;
@@ -42,6 +43,8 @@ public class LocalFile extends AbstractJingleFileTransferFile {
     public LocalFile(File file, String description, String mediaType) {
         super();
         this.file = file;
+        String path = file.getAbsolutePath();
+        name = path.substring(path.lastIndexOf(File.separator) + 1);
         this.description = description;
         this.mediaType = mediaType;
     }
@@ -51,6 +54,9 @@ public class LocalFile extends AbstractJingleFileTransferFile {
         return new Date(file.lastModified());
     }
 
+    public void setDate(Date date) {
+    }
+
     @Override
     public long getSize() {
         return file.length();
@@ -58,8 +64,11 @@ public class LocalFile extends AbstractJingleFileTransferFile {
 
     @Override
     public String getName() {
-        String path = file.getAbsolutePath();
-        return path.substring(path.lastIndexOf(File.separator) + 1);
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
     }
 
     @Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/IncomingFileOfferController.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/IncomingFileOfferController.java
index 56c665519..0e090dfab 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/IncomingFileOfferController.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/IncomingFileOfferController.java
@@ -24,7 +24,7 @@ import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 
 /**
- * Created by vanitas on 27.07.17.
+ * User interface for an incoming Jingle file offer.
  */
 public interface IncomingFileOfferController extends JingleFileTransferController {
     Future<Void> accept(XMPPConnection connection, File target) throws InterruptedException, XMPPException.XMPPErrorException, SmackException.NotConnectedException, SmackException.NoResponseException;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/JingleFileTransferController.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/JingleFileTransferController.java
index b4c408660..9c53049fd 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/JingleFileTransferController.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/JingleFileTransferController.java
@@ -16,6 +16,7 @@
  */
 package org.jivesoftware.smackx.jft.controller;
 
+import org.jivesoftware.smackx.jft.component.file.AbstractJingleFileTransferFile;
 import org.jivesoftware.smackx.jft.listener.ProgressListener;
 import org.jivesoftware.smackx.jingle.JingleDescriptionController;
 
@@ -28,4 +29,5 @@ public interface JingleFileTransferController extends JingleDescriptionControlle
 
     void removeProgressListener(ProgressListener listener);
 
+    AbstractJingleFileTransferFile getFile();
 }