moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2025-02-07 10:20:12 -05:00
Code Issues Releases Wiki Activity

limited offline support for pgp group chats

Browse Source 
use pgp key from contact if not set in muc
fixes #283
This commit is contained in:
Daniel Gultsch 2017-04-25 15:19:47 +02:00
parent 848c339c8d
commit 2cfa3ce288
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/entities/MucOptions.java
View File

@ -242,7 +242,13 @@ public class MucOptions {
} }
public long getPgpKeyId() { public long getPgpKeyId() {
return this.pgpKeyId; if (this.pgpKeyId != 0) {
return this.pgpKeyId;
} else if (realJid != null) {
return getAccount().getRoster().getContact(realJid).getPgpKeyId();
} else {
return 0;
}
} }
public Contact getContact() { public Contact getContact() {