aboutsummaryrefslogtreecommitdiffstats
path: root/src/de/gultsch/chat/entities/Conversation.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-28 18:46:01 +0100
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-28 18:46:01 +0100
commitacf80bddd07d5579cdb20a888b3f9e99e53030a5 (patch)
tree034a8e364488c89c8e1997f56313d919019afa65 /src/de/gultsch/chat/entities/Conversation.java
parent03d96266f8bbb76e25610e903d74a0afa7dcd03b (diff)
rebranding
Diffstat (limited to '')
-rw-r--r--src/eu/siacs/conversations/entities/Conversation.java (renamed from src/de/gultsch/chat/entities/Conversation.java)19
1 files changed, 16 insertions, 3 deletions
diff --git a/src/de/gultsch/chat/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index 3f83010c..d1186a7d 100644
--- a/src/de/gultsch/chat/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -1,11 +1,11 @@
-package de.gultsch.chat.entities;
+package eu.siacs.conversations.entities;
import java.security.interfaces.DSAPublicKey;
import java.util.ArrayList;
import java.util.List;
-import de.gultsch.chat.crypto.OtrEngine;
-import de.gultsch.chat.xmpp.XmppConnection;
+import eu.siacs.conversations.crypto.OtrEngine;
+import eu.siacs.conversations.xmpp.XmppConnection;
import net.java.otr4j.OtrException;
import net.java.otr4j.crypto.OtrCryptoEngineImpl;
@@ -59,6 +59,8 @@ public class Conversation extends AbstractEntity {
public int nextMessageEncryption = Message.ENCRYPTION_NONE;
+ private transient MucOptions mucOptions = null;
+
public Conversation(String name, Account account,
String contactJid, int mode) {
this(java.util.UUID.randomUUID().toString(), name, null, account.getUuid(), contactJid, System
@@ -268,4 +270,15 @@ public class Conversation extends AbstractEntity {
}
return this.otrFingerprint;
}
+
+ public MucOptions getMucOptions() {
+ if (this.mucOptions == null) {
+ this.mucOptions = new MucOptions();
+ }
+ return this.mucOptions ;
+ }
+
+ public void resetMucOptions() {
+ this.mucOptions = null;
+ }
}