feed version response from app name instead of static variable

Daniel Gultsch created 9 years ago

Change summary

src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java | 4 
src/main/java/eu/siacs/conversations/generator/IqGenerator.java       | 3 
2 files changed, 4 insertions(+), 3 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java

@@ -13,6 +13,7 @@ import java.util.Locale;
 import java.util.TimeZone;
 
 import eu.siacs.conversations.Config;
+import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.axolotl.AxolotlService;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.utils.PhoneHelper;
@@ -49,7 +50,6 @@ public abstract class AbstractGenerator {
 			"urn:xmpp:otr: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.SSS'Z'", Locale.US);
@@ -68,7 +68,7 @@ public abstract class AbstractGenerator {
 	}
 
 	public String getIdentityName() {
-		return IDENTITY_NAME + " " + getIdentityVersion();
+		return mXmppConnectionService.getString(R.string.app_name) + " " + getIdentityVersion();
 	}
 
 	public String getCapHash() {

src/main/java/eu/siacs/conversations/generator/IqGenerator.java

@@ -18,6 +18,7 @@ import java.util.Set;
 import java.util.TimeZone;
 
 import eu.siacs.conversations.Config;
+import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.axolotl.AxolotlService;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
@@ -57,7 +58,7 @@ public class IqGenerator extends AbstractGenerator {
 	public IqPacket versionResponse(final IqPacket request) {
 		final IqPacket packet = request.generateResponse(IqPacket.TYPE.RESULT);
 		Element query = packet.query("jabber:iq:version");
-		query.addChild("name").setContent(IDENTITY_NAME);
+		query.addChild("name").setContent(mXmppConnectionService.getString(R.string.app_name));
 		query.addChild("version").setContent(getIdentityVersion());
 		return packet;
 	}