fixed pgp decryption of automatically accepted jingle ft
This commit is contained in:
parent
d3ccba445a
commit
daf7e6224f
|
@ -119,6 +119,8 @@ public class JingleConnection implements Transferable {
|
|||
}
|
||||
Log.d(Config.LOGTAG, "successfully transmitted file:" + file.getAbsolutePath() + " (" + CryptoHelper.bytesToHex(file.getSha1Sum()) + ")");
|
||||
return;
|
||||
} else if (message.getEncryption() == Message.ENCRYPTION_PGP) {
|
||||
account.getPgpDecryptionService().decrypt(message, true);
|
||||
}
|
||||
} else {
|
||||
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)) {
|
||||
if (VALID_IMAGE_EXTENSIONS.contains(extension.secondary)) {
|
||||
message.setType(Message.TYPE_IMAGE);
|
||||
message.setRelativeFilePath(message.getUuid() + "." + extension.main);
|
||||
message.setRelativeFilePath(message.getUuid() + "." + extension.secondary);
|
||||
} else {
|
||||
message.setType(Message.TYPE_FILE);
|
||||
message.setRelativeFilePath(message.getUuid() + (extension.secondary != null ? ("." + extension.secondary) : ""));
|
||||
|
|
Loading…
Reference in New Issue