1 files changed, 5 insertions, 32 deletions

diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
index 4be6c621..0c750765 100644
--- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
@@ -12,11 +12,9 @@ import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.tzur.conversations.Settings;
 import eu.siacs.conversations.crypto.axolotl.AxolotlService;
-import eu.siacs.conversations.services.XmppConnectionService;
-import eu.siacs.conversations.utils.PhoneHelper;
-import eu.siacs.conversations.xmpp.jid.Jid;
-import eu.siacs.conversations.xmpp.stanzas.IqPacket;
 
 public abstract class AbstractGenerator {
 	private final String[] FEATURES = {
@@ -38,35 +36,13 @@ public abstract class AbstractGenerator {
 			"urn:xmpp:chat-markers:0",
 			"urn:xmpp:receipts"
 	};
-	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 + "//" + getIdentityName() + "<");
+		s.append("client/" + IDENTITY_TYPE + "//" + ConversationsPlusApplication.getNameAndVersion() + "<");
 		MessageDigest md;
 		try {
 			md = MessageDigest.getInstance("SHA-1");
@@ -78,7 +54,7 @@ public abstract class AbstractGenerator {
 			s.append(feature + "<");
 		}
 		byte[] sha1 = md.digest(s.toString().getBytes());
-		return new String(Base64.encode(sha1, Base64.DEFAULT)).trim();
+		return new String(Base64.encode(sha1, Base64.DEFAULT));
 	}
 
 	public static String getTimestamp(long time) {
@@ -89,12 +65,9 @@ public abstract class AbstractGenerator {
 	public List<String> getFeatures() {
 		ArrayList<String> features = new ArrayList<>();
 		features.addAll(Arrays.asList(FEATURES));
-		if (mXmppConnectionService.confirmMessages()) {
+		if (Settings.CONFIRM_MESSAGE_RECEIVED) {
 			features.addAll(Arrays.asList(MESSAGE_CONFIRMATION_FEATURES));
 		}
-		if (mXmppConnectionService.allowMessageCorrection()) {
-			features.addAll(Arrays.asList(MESSAGE_CORRECTION_FEATURES));
-		}
 		Collections.sort(features);
 		return features;
 	}