diff options
author | lookshe <github@lookshe.org> | 2015-10-05 13:55:43 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2015-10-05 13:55:43 +0200 |
commit | b98478e57c088efc63fd470e429f791dd664707a (patch) | |
tree | e722ed48ee2ec125d8ad9250f79d8e1ca95666a7 /src/main/java/eu/siacs/conversations/generator | |
parent | 5850cbcf9c3e72580f3288c582737a04e8148b79 (diff) | |
parent | 6f17b06ad008cc7ac89174ba7ac7cc96ee0881eb (diff) |
Merge branch 'trz/rename' into trz/rebase
Conflicts:
build.gradle
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java index 16984910..3607b69a 100644 --- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java @@ -35,7 +35,8 @@ public abstract class AbstractGenerator { "urn:xmpp:receipts" }; private String mVersion = null; - public final String IDENTITY_NAME = "Conversations"; + //FIXME use appname or similar!!!!!!!!!!!11elf + public final String IDENTITY_NAME = "Conversations+"; public final String IDENTITY_TYPE = "phone"; private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US); |