narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

feed version response from app name instead of static variable

Browse source
This commit is contained in:
Daniel Gultsch 2016-07-22 18:22:21 +02:00
parent 6dcce76568
commit 3d372cb339
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
View file

@ -13,6 +13,7 @@ import java.util.Locale;
import java.util.TimeZone; import java.util.TimeZone;
import eu.siacs.conversations.Config; import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.crypto.axolotl.AxolotlService; import eu.siacs.conversations.crypto.axolotl.AxolotlService;
import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.utils.PhoneHelper; import eu.siacs.conversations.utils.PhoneHelper;
@ -49,7 +50,6 @@ public abstract class AbstractGenerator {
"urn:xmpp:otr:0" "urn:xmpp:otr:0"
}; };
private String mVersion = null; private String mVersion = null;
protected final String IDENTITY_NAME = "Conversations";
protected final String IDENTITY_TYPE = "phone"; 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); 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() { public String getIdentityName() {
return IDENTITY_NAME + " " + getIdentityVersion(); return mXmppConnectionService.getString(R.string.app_name) + " " + getIdentityVersion();
} }
public String getCapHash() { public String getCapHash() {

3
src/main/java/eu/siacs/conversations/generator/IqGenerator.java
View file

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