1 files changed, 14 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index a708b0ce..b3a31127 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -5,7 +5,6 @@ import android.database.Cursor;
 import android.os.SystemClock;
 import android.util.Pair;
 
-import eu.siacs.conversations.crypto.PgpDecryptionService;
 import net.java.otr4j.crypto.OtrCryptoEngineImpl;
 import net.java.otr4j.crypto.OtrCryptoException;
 
@@ -20,10 +19,14 @@ import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.OtrService;
+import eu.siacs.conversations.crypto.PgpDecryptionService;
 import eu.siacs.conversations.crypto.axolotl.AxolotlService;
+import eu.siacs.conversations.crypto.axolotl.AxolotlServiceImpl;
+import eu.siacs.conversations.crypto.axolotl.AxolotlServiceStub;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.xmpp.XmppConnection;
 import eu.siacs.conversations.xmpp.jid.InvalidJidException;
@@ -184,6 +187,10 @@ public class Account extends AbstractEntity {
 	private Presence.Status presenceStatus = Presence.Status.ONLINE;
 	private String presenceStatusMessage = null;
 
+	public Account() {
+		this.uuid = "0";
+	}
+
 	public Account(final Jid jid, final String password) {
 		this(java.util.UUID.randomUUID().toString(), jid,
 				password, 0, null, "", null, null, null, 5222, Presence.Status.ONLINE, null);
@@ -275,10 +282,6 @@ public class Account extends AbstractEntity {
 		return this.hostname == null ? "" : this.hostname;
 	}
 
-	public boolean isOnion() {
-		return getServer().toString().toLowerCase().endsWith(".onion");
-	}
-
 	public void setPort(int port) {
 		this.port = port;
 	}
@@ -394,10 +397,15 @@ public class Account extends AbstractEntity {
 
 	public void initAccountServices(final XmppConnectionService context) {
 		this.mOtrService = new OtrService(context, this);
-		this.axolotlService = new AxolotlService(this, context);
+        if (ConversationsPlusPreferences.omemoEnabled()) {
+            this.axolotlService = new AxolotlServiceImpl(this, context);
             if (xmppConnection != null) {
                 xmppConnection.addOnAdvancedStreamFeaturesAvailableListener(axolotlService);
             }
+        } else {
+            this.axolotlService = new AxolotlServiceStub();
+        }
+
 		this.pgpDecryptionService = new PgpDecryptionService(context);
 	}