From 198dc2c6b444671ec71deb10fbbaaced6e03dced Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 1 Mar 2016 11:26:59 +0100
Subject: let users confirm each member in a conference even if that contact is
 already trusted

---
 .../siacs/conversations/entities/Conversation.java | 72 +++++++++++++++++++---
 1 file changed, 63 insertions(+), 9 deletions(-)

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

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index f05b3f91..0252ea74 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -9,11 +9,13 @@ import net.java.otr4j.session.SessionID;
 import net.java.otr4j.session.SessionImpl;
 import net.java.otr4j.session.SessionStatus;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.security.interfaces.DSAPublicKey;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
@@ -48,6 +50,7 @@ public class Conversation extends AbstractEntity implements Blockable {
 	public static final String ATTRIBUTE_MUC_PASSWORD = "muc_password";
 	public static final String ATTRIBUTE_MUTED_TILL = "muted_till";
 	public static final String ATTRIBUTE_ALWAYS_NOTIFY = "always_notify";
+	public static final String ATTRIBUTE_CRYPTO_TARGETS = "crypto_targets";
 
 	private String name;
 	private String contactUuid;
@@ -313,6 +316,18 @@ public class Conversation extends AbstractEntity implements Blockable {
 		return getLongAttribute("last_clear_history", 0);
 	}
 
+	public List<Jid> getAcceptedCryptoTargets() {
+		if (mode == MODE_SINGLE) {
+			return Arrays.asList(getJid().toBareJid());
+		} else {
+			return getJidListAttribute(ATTRIBUTE_CRYPTO_TARGETS);
+		}
+	}
+
+	public void setAcceptedCryptoTargets(List<Jid> acceptedTargets) {
+		setAttribute(ATTRIBUTE_CRYPTO_TARGETS, acceptedTargets);
+	}
+
 	public void setCorrectingMessage(Message correctingMessage) {
 		this.correctingMessage = correctingMessage;
 	}
@@ -794,20 +809,59 @@ public class Conversation extends AbstractEntity implements Blockable {
 	}
 
 	public boolean setAttribute(String key, String value) {
-		try {
-			this.attributes.put(key, value);
-			return true;
-		} catch (JSONException e) {
-			return false;
+		synchronized (this.attributes) {
+			try {
+				this.attributes.put(key, value);
+				return true;
+			} catch (JSONException e) {
+				return false;
+			}
+		}
+	}
+
+	public boolean setAttribute(String key, List<Jid> jids) {
+		JSONArray array = new JSONArray();
+		for(Jid jid : jids) {
+			array.put(jid.toBareJid().toString());
+		}
+		synchronized (this.attributes) {
+			try {
+				this.attributes.put(key, array);
+				return true;
+			} catch (JSONException e) {
+				e.printStackTrace();
+				return false;
+			}
 		}
 	}
 
 	public String getAttribute(String key) {
-		try {
-			return this.attributes.getString(key);
-		} catch (JSONException e) {
-			return null;
+		synchronized (this.attributes) {
+			try {
+				return this.attributes.getString(key);
+			} catch (JSONException e) {
+				return null;
+			}
+		}
+	}
+
+	public List<Jid> getJidListAttribute(String key) {
+		ArrayList<Jid> list = new ArrayList<>();
+		synchronized (this.attributes) {
+			try {
+				JSONArray array = this.attributes.getJSONArray(key);
+				for (int i = 0; i < array.length(); ++i) {
+					try {
+						list.add(Jid.fromString(array.getString(i)));
+					} catch (InvalidJidException e) {
+						//ignored
+					}
+				}
+			} catch (JSONException e) {
+				//ignored
+			}
 		}
+		return list;
 	}
 
 	public int getIntAttribute(String key, int defaultValue) {
-- 
cgit v1.2.3