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

try to make in-valid-session detection work for pgp

Browse source
This commit is contained in:
Daniel Gultsch 2016-01-29 12:09:31 +01:00
parent d2c5a939ed
commit 28ebf927fb
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/eu/siacs/conversations/entities/Message.java
View file

@ -743,13 +743,20 @@ public class Message extends AbstractEntity {
} }
public boolean isValidInSession() { public boolean isValidInSession() {
int pastEncryption = this.getPreviousEncryption(); int pastEncryption = getCleanedEncryption(this.getPreviousEncryption());
int futureEncryption = this.getNextEncryption(); int futureEncryption = getCleanedEncryption(this.getNextEncryption());
boolean inUnencryptedSession = pastEncryption == ENCRYPTION_NONE boolean inUnencryptedSession = pastEncryption == ENCRYPTION_NONE
|| futureEncryption == ENCRYPTION_NONE || futureEncryption == ENCRYPTION_NONE
|| pastEncryption != futureEncryption; || pastEncryption != futureEncryption;
return inUnencryptedSession || this.getEncryption() == pastEncryption; return inUnencryptedSession || getCleanedEncryption(this.getEncryption()) == pastEncryption;
}
private static int getCleanedEncryption(int encryption) {
if (encryption == ENCRYPTION_DECRYPTED || encryption == ENCRYPTION_DECRYPTION_FAILED) {
return ENCRYPTION_PGP;
}
return encryption;
} }
} }