narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed pgp decryption of automatically accepted jingle ft

Browse source
This commit is contained in:
Daniel Gultsch 2019-08-16 15:29:58 +02:00
parent d3ccba445a
commit daf7e6224f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
View file

@ -119,6 +119,8 @@ public class JingleConnection implements Transferable {
} }
Log.d(Config.LOGTAG, "successfully transmitted file:" + file.getAbsolutePath() + " (" + CryptoHelper.bytesToHex(file.getSha1Sum()) + ")"); Log.d(Config.LOGTAG, "successfully transmitted file:" + file.getAbsolutePath() + " (" + CryptoHelper.bytesToHex(file.getSha1Sum()) + ")");
return; return;
} else if (message.getEncryption() == Message.ENCRYPTION_PGP) {
account.getPgpDecryptionService().decrypt(message, true);
} }
} else { } else {
if (ftVersion == Content.Version.FT_5) { //older Conversations will break when receiving a session-info if (ftVersion == Content.Version.FT_5) { //older Conversations will break when receiving a session-info
@ -423,7 +425,7 @@ public class JingleConnection implements Transferable {
} else if (VALID_CRYPTO_EXTENSIONS.contains(extension.main)) { } else if (VALID_CRYPTO_EXTENSIONS.contains(extension.main)) {
if (VALID_IMAGE_EXTENSIONS.contains(extension.secondary)) { if (VALID_IMAGE_EXTENSIONS.contains(extension.secondary)) {
message.setType(Message.TYPE_IMAGE); message.setType(Message.TYPE_IMAGE);
message.setRelativeFilePath(message.getUuid() + "." + extension.main); message.setRelativeFilePath(message.getUuid() + "." + extension.secondary);
} else { } else {
message.setType(Message.TYPE_FILE); message.setType(Message.TYPE_FILE);
message.setRelativeFilePath(message.getUuid() + (extension.secondary != null ? ("." + extension.secondary) : "")); message.setRelativeFilePath(message.getUuid() + (extension.secondary != null ? ("." + extension.secondary) : ""));