Removed unnecessary dependencies to XmppConnectionService and added allowMessageCorrection to preferences

5 files changed, 11 insertions, 43 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
index 17829998..c135e457 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
@@ -193,6 +193,10 @@ public class ConversationsPlusPreferences extends Settings {
         return getBoolean("indicate_received", false);
     }
 
+    public static boolean allowMessageCorrection() {
+        return getBoolean("allow_message_correction", true);
+    }
+
     private ConversationsPlusPreferences(SharedPreferences sharedPreferences) {
         this.sharedPreferences = sharedPreferences;
     }
diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
index 7e2ff213..f50ec1b4 100644
--- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
@@ -13,6 +13,7 @@ import java.util.Locale;
 import java.util.TimeZone;
 
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.tzur.conversations.Settings;
 import eu.siacs.conversations.crypto.axolotl.AxolotlService;
 import eu.siacs.conversations.services.XmppConnectionService;
@@ -43,29 +44,10 @@ public abstract class AbstractGenerator {
 	private final String[] MESSAGE_CORRECTION_FEATURES = {
 			"urn:xmpp:message-correct:0"
 	};
-	private String mVersion = null;
-	protected final String IDENTITY_NAME = "Conversations";
 	protected final String IDENTITY_TYPE = "phone";
 
 	private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
 
-	protected XmppConnectionService mXmppConnectionService;
-
-	protected AbstractGenerator(XmppConnectionService service) {
-		this.mXmppConnectionService = service;
-	}
-
-	protected String getIdentityVersion() {
-		if (mVersion == null) {
-			this.mVersion = PhoneHelper.getVersionName(mXmppConnectionService);
-		}
-		return this.mVersion;
-	}
-
-	public String getIdentityName() {
-		return IDENTITY_NAME + " " + getIdentityVersion();
-	}
-
 	public String getCapHash() {
 		StringBuilder s = new StringBuilder();
 		s.append("client/" + IDENTITY_TYPE + "//" + ConversationsPlusApplication.getNameAndVersion() + "<");
@@ -94,7 +76,7 @@ public abstract class AbstractGenerator {
 		if (Settings.CONFIRM_MESSAGE_RECEIVED) {
 			features.addAll(Arrays.asList(MESSAGE_CONFIRMATION_FEATURES));
 		}
-		if (mXmppConnectionService.allowMessageCorrection()) {
+		if (ConversationsPlusPreferences.allowMessageCorrection()) {
 			features.addAll(Arrays.asList(MESSAGE_CORRECTION_FEATURES));
 		}
 		Collections.sort(features);
diff --git a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
index 6c6f5507..9ac7d318 100644
--- a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
@@ -3,17 +3,11 @@ package eu.siacs.conversations.generator;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Presence;
-import eu.siacs.conversations.entities.Presences;
-import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
 
 public class PresenceGenerator extends AbstractGenerator {
 
-	public PresenceGenerator(XmppConnectionService service) {
-		super(service);
-	}
-
 	private PresencePacket subscription(String type, Contact contact) {
 		PresencePacket packet = new PresencePacket();
 		packet.setAttribute("type", type);
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 794badae..1ad28c40 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -394,7 +394,7 @@ public class MessageParser extends AbstractParser implements
 				updateLastseen(timestamp, account, packet.getFrom(), true);
 			}
 
-			if (replacementId != null && mXmppConnectionService.allowMessageCorrection()) {
+			if (replacementId != null && ConversationsPlusPreferences.allowMessageCorrection()) {
 				Message replacedMessage = conversation.findMessageWithRemoteIdAndCounterpart(replacementId,
 						counterpart,
 						message.getStatus() == Message.STATUS_RECEIVED,
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 9da9ffb2..4c9cac69 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1488,7 +1488,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					databaseBackend.deleteAccount(account);
 				}
 			};
-			mDatabaseExecutor.execute(runnable);
+			ConversationsPlusApplication.executeDatabaseOperation(runnable);
 			this.accounts.remove(account);
 			updateAccountUi();
 			getNotificationService().updateErrorNotification();
@@ -2176,9 +2176,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		final Account account = conversation.getAccount();
 		final Session otrSession = conversation.getOtrSession();
 		Logging.d(Config.LOGTAG,
-                account.getJid().toBareJid() + " otr session established with "
-                        + conversation.getJid() + "/"
-                        + otrSession.getSessionID().getUserID());
+				account.getJid().toBareJid() + " otr session established with "
+						+ conversation.getJid() + "/"
+						+ otrSession.getSessionID().getUserID());
 		conversation.findUnsentMessagesWithEncryption(Message.ENCRYPTION_OTR, new Conversation.OnMessageFound() {
 
 			@Override
@@ -2393,14 +2393,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		return getPreferences().getBoolean("confirm_messages", true);
 	}
 
-	public boolean allowMessageCorrection() {
-		return getPreferences().getBoolean("allow_message_correction", true);
-	}
-
-	public boolean sendChatStates() {
-		return getPreferences().getBoolean("chat_states", false);
-	}
-
 	public boolean saveEncryptedMessages() {
 		return !getPreferences().getBoolean("dont_save_encrypted", false);
 	}
@@ -2409,10 +2401,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		return getPreferences().getBoolean("autojoin", true);
 	}
 
-	public boolean indicateReceived() {
-		return getPreferences().getBoolean("indicate_received", false);
-	}
-
 	public boolean useTorToConnect() {
 		return Config.FORCE_ORBOT || getPreferences().getBoolean("use_tor", false);
 	}