From fd4897e1a5a843c8b55b28b00afa6778b345c9a5 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 22 May 2014 15:36:41 +0200
Subject: first tries on crypto muc

---
 .../siacs/conversations/entities/Conversation.java |  2 +-
 .../siacs/conversations/entities/MucOptions.java   | 31 +++++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

(limited to 'src/eu/siacs/conversations/entities')

diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index 37a230df5..a96996600 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -276,7 +276,7 @@ public class Conversation extends AbstractEntity {
 
 	public synchronized MucOptions getMucOptions() {
 		if (this.mucOptions == null) {
-			this.mucOptions = new MucOptions();
+			this.mucOptions = new MucOptions(this.getAccount());
 		}
 		this.mucOptions.setConversation(this);
 		return this.mucOptions;
diff --git a/src/eu/siacs/conversations/entities/MucOptions.java b/src/eu/siacs/conversations/entities/MucOptions.java
index fbca83402..ba2b9bbf2 100644
--- a/src/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/eu/siacs/conversations/entities/MucOptions.java
@@ -3,11 +3,10 @@ package eu.siacs.conversations.entities;
 import java.util.ArrayList;
 import java.util.List;
 
-import eu.siacs.conversations.entities.MucOptions.User;
+import eu.siacs.conversations.crypto.PgpEngine;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
 import android.annotation.SuppressLint;
-import android.util.Log;
 
 @SuppressLint("DefaultLocale")
 public class MucOptions {
@@ -31,6 +30,7 @@ public class MucOptions {
 		private int role;
 		private int affiliation;
 		private String name;
+		private long pgpKeyId = 0;
 		
 		public String getName() {
 			return name;
@@ -70,7 +70,15 @@ public class MucOptions {
 				this.affiliation = AFFILIATION_NONE;
 			}
 		}
+		public void setPgpKeyId(long id) {
+			this.pgpKeyId = id;
+		}
+		
+		public long getPgpKeyId() {
+			return this.pgpKeyId;
+		}
 	}
+	private Account account;
 	private ArrayList<User> users = new ArrayList<User>();
 	private Conversation conversation;
 	private boolean isOnline = false;
@@ -80,6 +88,9 @@ public class MucOptions {
 	private User self = new User();
 	private String subject = null;
 
+	public MucOptions(Account account) {
+		this.account = account;
+	}
 	
 	public void deleteUser(String name) {
 		for(int i = 0; i < users.size(); ++i) {
@@ -100,7 +111,7 @@ public class MucOptions {
 		users.add(user);
 		}
 	
-	public void processPacket(PresencePacket packet) {
+	public void processPacket(PresencePacket packet, PgpEngine pgp) {
 		String[] fromParts = packet.getFrom().split("/");
 		if (fromParts.length>=2) {
 			String name = fromParts[1];
@@ -119,6 +130,20 @@ public class MucOptions {
 				} else {
 					addUser(user);
 				}
+				if (pgp != null) {
+					Element x = packet.findChild("x",
+							"jabber:x:signed");
+					if (x != null) {
+						Element status = packet.findChild("status");
+						String msg;
+						if (status != null) {
+							msg = status.getContent();
+						} else {
+							msg = "";
+						}
+						user.setPgpKeyId(pgp.fetchKeyId(account,msg, x.getContent()));
+					}
+				}
 			} else if (type.equals("unavailable")) {
 				if (name.equals(getNick())) {
 					Element item = packet.findChild("x","http://jabber.org/protocol/muc#user").findChild("item");
-- 
cgit v1.2.3