diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-04-26 20:14:38 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-04-26 20:14:38 +0200 |
| commit | 0b023b918e9de278b8944eeb79cfed1b54f7fedc (patch) | |
| tree | 65e7eec8efd4a21aeb9803d502df62dc64fb8056 /src/main/java/de/pixart/messenger/entities | |
| parent | d73143a9c1e003c13c5fd2fea94795abb6e51d53 (diff) | |
limited offline support for pgp group chats
use pgp key from contact if not set in muc
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities')
| -rw-r--r-- | src/main/java/de/pixart/messenger/entities/MucOptions.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/MucOptions.java b/src/main/java/de/pixart/messenger/entities/MucOptions.java index 51345df04..ef2f4bee4 100644 --- a/src/main/java/de/pixart/messenger/entities/MucOptions.java +++ b/src/main/java/de/pixart/messenger/entities/MucOptions.java @@ -242,7 +242,13 @@ public class MucOptions { } 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() { |