From 0b023b918e9de278b8944eeb79cfed1b54f7fedc Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Wed, 26 Apr 2017 20:14:38 +0200
Subject: limited offline support for pgp group chats

use pgp key from contact if not set in muc
---
 src/main/java/de/pixart/messenger/entities/MucOptions.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/entities/MucOptions.java')

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() {
-- 
cgit v1.2.3