Merge branch 'development' of https://github.com/siacs/Conversations into siacs-development

5 files changed, 77 insertions, 15 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Downloadable.java b/src/main/java/eu/siacs/conversations/entities/Downloadable.java
index bb0ce09c0..56489774b 100644
--- a/src/main/java/eu/siacs/conversations/entities/Downloadable.java
+++ b/src/main/java/eu/siacs/conversations/entities/Downloadable.java
@@ -1,6 +1,6 @@
 package eu.siacs.conversations.entities;
 
-public interface Downloadable {
+public interface Transferable {
 
 	String[] VALID_IMAGE_EXTENSIONS = {"webp", "jpeg", "jpg", "png", "jpe"};
 	String[] VALID_CRYPTO_EXTENSIONS = {"pgp", "gpg", "otr"};
diff --git a/src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java b/src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java
index cce22ea39..e065953ef 100644
--- a/src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java
+++ b/src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java
@@ -1,10 +1,10 @@
 package eu.siacs.conversations.entities;
 
-public class DownloadablePlaceholder implements Downloadable {
+public class TransferablePlaceholder implements Transferable {
 
 	private int status;
 
-	public DownloadablePlaceholder(int status) {
+	public TransferablePlaceholder(int status) {
 		this.status = status;
 	}
 	@Override
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 078a45659..28ef89df1 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -70,7 +70,7 @@ public class Message extends AbstractEntity {
 	protected String remoteMsgId = null;
 	protected String serverMsgId = null;
 	protected Conversation conversation = null;
-	protected Downloadable downloadable = null;
+	protected Transferable transferable = null;
 	private Message mNextMessage = null;
 	private Message mPreviousMessage = null;
 
@@ -308,12 +308,12 @@ public class Message extends AbstractEntity {
 		this.trueCounterpart = trueCounterpart;
 	}
 
-	public Downloadable getDownloadable() {
-		return this.downloadable;
+	public Transferable getTransferable() {
+		return this.transferable;
 	}
 
-	public void setDownloadable(Downloadable downloadable) {
-		this.downloadable = downloadable;
+	public void setTransferable(Transferable transferable) {
+		this.transferable = transferable;
 	}
 
 	public boolean equals(Message message) {
@@ -364,8 +364,8 @@ public class Message extends AbstractEntity {
 	public boolean mergeable(final Message message) {
 		return message != null &&
 				(message.getType() == Message.TYPE_TEXT &&
-						this.getDownloadable() == null &&
-						message.getDownloadable() == null &&
+						this.getTransferable() == null &&
+						message.getTransferable() == null &&
 						message.getEncryption() != Message.ENCRYPTION_PGP &&
 						this.getType() == message.getType() &&
 						//this.getStatus() == message.getStatus() &&
@@ -471,7 +471,7 @@ public class Message extends AbstractEntity {
 		if (extensionParts.length == 2) {
 			return extensionParts[extensionParts.length - 1];
 		} else if (extensionParts.length == 3 && Arrays
-				.asList(Downloadable.VALID_CRYPTO_EXTENSIONS)
+				.asList(Transferable.VALID_CRYPTO_EXTENSIONS)
 				.contains(extensionParts[extensionParts.length - 1])) {
 			return extensionParts[extensionParts.length -2];
 		}
@@ -517,8 +517,8 @@ public class Message extends AbstractEntity {
 				} else {
 					return Decision.NEVER;
 				}
-			} else if (Arrays.asList(Downloadable.VALID_IMAGE_EXTENSIONS).contains(extension)
-					|| Arrays.asList(Downloadable.WELL_KNOWN_EXTENSIONS).contains(extension)) {
+			} else if (Arrays.asList(Transferable.VALID_IMAGE_EXTENSIONS).contains(extension)
+					|| Arrays.asList(Transferable.WELL_KNOWN_EXTENSIONS).contains(extension)) {
 				return Decision.SHOULD;
 			} else {
 				return Decision.NEVER;
@@ -539,8 +539,8 @@ public class Message extends AbstractEntity {
 			return params;
 		}
 		params = new FileParams();
-		if (this.downloadable != null) {
-			params.size = this.downloadable.getFileSize();
+		if (this.transferable != null) {
+			params.size = this.transferable.getFileSize();
 		}
 		if (body == null) {
 			return params;
diff --git a/src/main/java/eu/siacs/conversations/entities/Transferable.java b/src/main/java/eu/siacs/conversations/entities/Transferable.java
new file mode 100644
index 000000000..56489774b
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/entities/Transferable.java
@@ -0,0 +1,28 @@
+package eu.siacs.conversations.entities;
+
+public interface Transferable {
+
+	String[] VALID_IMAGE_EXTENSIONS = {"webp", "jpeg", "jpg", "png", "jpe"};
+	String[] VALID_CRYPTO_EXTENSIONS = {"pgp", "gpg", "otr"};
+	String[] WELL_KNOWN_EXTENSIONS = {"pdf","m4a","mp3","avi","mp4","apk","vcf"};
+
+	int STATUS_UNKNOWN = 0x200;
+	int STATUS_CHECKING = 0x201;
+	int STATUS_FAILED = 0x202;
+	int STATUS_OFFER = 0x203;
+	int STATUS_DOWNLOADING = 0x204;
+	int STATUS_DELETED = 0x205;
+	int STATUS_OFFER_CHECK_FILESIZE = 0x206;
+	int STATUS_UPLOADING = 0x207;
+
+
+	boolean start();
+
+	int getStatus();
+
+	long getFileSize();
+
+	int getProgress();
+
+	void cancel();
+}
diff --git a/src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java b/src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java
new file mode 100644
index 000000000..e065953ef
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java
@@ -0,0 +1,34 @@
+package eu.siacs.conversations.entities;
+
+public class TransferablePlaceholder implements Transferable {
+
+	private int status;
+
+	public TransferablePlaceholder(int status) {
+		this.status = status;
+	}
+	@Override
+	public boolean start() {
+		return false;
+	}
+
+	@Override
+	public int getStatus() {
+		return status;
+	}
+
+	@Override
+	public long getFileSize() {
+		return 0;
+	}
+
+	@Override
+	public int getProgress() {
+		return 0;
+	}
+
+	@Override
+	public void cancel() {
+
+	}
+}