sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixup for pep omemo notification dedup

This commit is contained in:
Daniel Gultsch 2017-12-13 20:28:30 +01:00
parent 9a796df2a3
commit 782b8fb744
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
View File

@ -391,11 +391,13 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
public void registerDevices(final Jid jid, @NonNull final Set<Integer> deviceIds) { public void registerDevices(final Jid jid, @NonNull final Set<Integer> deviceIds) {
final int hash = deviceIds.hashCode(); final int hash = deviceIds.hashCode();
final boolean me = jid.toBareJid().equals(account.getJid().toBareJid()); final boolean me = jid.toBareJid().equals(account.getJid().toBareJid());
if (me && hash == this.lastDeviceListNotificationHash) { if (me) {
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": ignoring duplicate own device id list"); if (hash == this.lastDeviceListNotificationHash) {
return; Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": ignoring duplicate own device id list");
return;
}
this.lastDeviceListNotificationHash = hash;
} }
this.lastDeviceListNotificationHash = hash;
boolean needsPublishing = me && !deviceIds.contains(getOwnDeviceId()); boolean needsPublishing = me && !deviceIds.contains(getOwnDeviceId());
if (me) { if (me) {
deviceIds.remove(getOwnDeviceId()); deviceIds.remove(getOwnDeviceId());

2
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -1250,7 +1250,7 @@ public class XmppConnectionService extends Service {
if (!message.needsUploading()) { if (!message.needsUploading()) {
String pgpBody = message.getEncryptedBody(); String pgpBody = message.getEncryptedBody();
String decryptedBody = message.getBody(); String decryptedBody = message.getBody();
message.setBody(pgpBody); message.setBody(pgpBody); //TODO might throw NPE
message.setEncryption(Message.ENCRYPTION_PGP); message.setEncryption(Message.ENCRYPTION_PGP);
if (message.edited()) { if (message.edited()) {
message.setBody(decryptedBody); message.setBody(decryptedBody);