rebranding

6 files changed, 24 insertions, 11 deletions

diff --git a/src/de/gultsch/chat/entities/AbstractEntity.java b/src/eu/siacs/conversations/entities/AbstractEntity.java
index 31a19fc0..0297fa66 100644
--- a/src/de/gultsch/chat/entities/AbstractEntity.java
+++ b/src/eu/siacs/conversations/entities/AbstractEntity.java
@@ -1,4 +1,4 @@
-package de.gultsch.chat.entities;
+package eu.siacs.conversations.entities;
 
 import java.io.Serializable;
 
diff --git a/src/de/gultsch/chat/entities/Account.java b/src/eu/siacs/conversations/entities/Account.java
index c8f6d063..a596aba1 100644
--- a/src/de/gultsch/chat/entities/Account.java
+++ b/src/eu/siacs/conversations/entities/Account.java
@@ -1,4 +1,4 @@
-package de.gultsch.chat.entities;
+package eu.siacs.conversations.entities;
 
 import java.security.interfaces.DSAPublicKey;
 
@@ -8,8 +8,8 @@ import net.java.otr4j.crypto.OtrCryptoException;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-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 android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
diff --git a/src/de/gultsch/chat/entities/Contact.java b/src/eu/siacs/conversations/entities/Contact.java
index a8c9fa62..0eed39ed 100644
--- a/src/de/gultsch/chat/entities/Contact.java
+++ b/src/eu/siacs/conversations/entities/Contact.java
@@ -1,4 +1,4 @@
-package de.gultsch.chat.entities;
+package eu.siacs.conversations.entities;
 
 import java.io.Serializable;
 import java.util.HashSet;
@@ -9,7 +9,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import de.gultsch.chat.xml.Element;
+import eu.siacs.conversations.xml.Element;
 
 import android.content.ContentValues;
 import android.database.Cursor;
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;
+	}
 }
diff --git a/src/de/gultsch/chat/entities/Message.java b/src/eu/siacs/conversations/entities/Message.java
index 58e4ef63..0fce2a5b 100644
--- a/src/de/gultsch/chat/entities/Message.java
+++ b/src/eu/siacs/conversations/entities/Message.java
@@ -1,4 +1,4 @@
-package de.gultsch.chat.entities;
+package eu.siacs.conversations.entities;
 
 import android.content.ContentValues;
 import android.database.Cursor;
diff --git a/src/de/gultsch/chat/entities/Presences.java b/src/eu/siacs/conversations/entities/Presences.java
index aabc8440..af7926a8 100644
--- a/src/de/gultsch/chat/entities/Presences.java
+++ b/src/eu/siacs/conversations/entities/Presences.java
@@ -1,4 +1,4 @@
-package de.gultsch.chat.entities;
+package eu.siacs.conversations.entities;
 
 import java.util.Hashtable;
 import java.util.Iterator;