aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-14 03:27:18 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-15 15:34:12 +0100
commit16847a30c88246381a026bce9f2435be2bd77422 (patch)
treecbd5afe1282f9ec4faca5be4cff14c7e6112c807 /src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
parentc7acfe85c379b99c05cef98dbbab6f815b99ed83 (diff)
support for pgp files
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java')
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index f42e89a9..793c6c54 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -306,6 +306,8 @@ public class JingleConnection implements Downloadable {
suffix = parts[parts.length - 1];
if (message.getEncryption() == Message.ENCRYPTION_OTR && suffix.endsWith(".otr")) {
suffix = suffix.substring(0,suffix.length() - 4);
+ } else if (message.getEncryption() == Message.ENCRYPTION_PGP && (suffix.endsWith(".pgp") || suffix.endsWith(".gpg"))) {
+ suffix = suffix.substring(0,suffix.length() - 4);
}
}
message.setRelativeFilePath(message.getUuid()+"_"+suffix);