limited offline support for pgp group chats

use pgp key from contact if not set in muc fixes #283
2017-04-25 15:19:47 +02:00 · 2017-04-25 15:19:47 +02:00 · 2cfa3ce288
parent 848c339c8d
commit 2cfa3ce288
1 changed files with 7 additions and 1 deletions
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/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() {