use application/pgp-encrypted mime type when necessary for http upload

Daniel Gultsch created 8 years ago

Change summary

src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java | 6 
1 file changed, 5 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java

@@ -96,7 +96,11 @@ public class HttpUploadConnection implements Transferable {
 		this.message = message;
 		this.account = message.getConversation().getAccount();
 		this.file = mXmppConnectionService.getFileBackend().getFile(message, false);
-		this.mime = this.file.getMimeType();
+		if (message.getEncryption() == Message.ENCRYPTION_PGP || message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
+			this.mime = "application/pgp-encrypted";
+		} else {
+			this.mime = this.file.getMimeType();
+		}
 		this.delayed = delay;
 		if (Config.ENCRYPT_ON_HTTP_UPLOADED
 				|| message.getEncryption() == Message.ENCRYPTION_AXOLOTL