sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

announce OTR support as per XEP-0378

This commit is contained in:
Daniel Gultsch 2016-07-17 22:51:40 +02:00
parent e90e333f29
commit 2843a0af26
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
View File

@ -45,6 +45,9 @@ public abstract class AbstractGenerator {
private final String[] PRIVACY_SENSITIVE = { private final String[] PRIVACY_SENSITIVE = {
"urn:xmpp:time" //XEP-0202: Entity Time leaks time zone "urn:xmpp:time" //XEP-0202: Entity Time leaks time zone
}; };
private final String[] OTR = {
"urn:xmpp:otr:0"
};
private String mVersion = null; private String mVersion = null;
protected final String IDENTITY_NAME = "Conversations"; protected final String IDENTITY_NAME = "Conversations";
protected final String IDENTITY_TYPE = "phone"; protected final String IDENTITY_TYPE = "phone";
@ -105,6 +108,9 @@ public abstract class AbstractGenerator {
if (!mXmppConnectionService.useTorToConnect()) { if (!mXmppConnectionService.useTorToConnect()) {
features.addAll(Arrays.asList(PRIVACY_SENSITIVE)); features.addAll(Arrays.asList(PRIVACY_SENSITIVE));
} }
if (Config.supportOtr()) {
features.addAll(Arrays.asList(OTR));
}
Collections.sort(features); Collections.sort(features);
return features; return features;
} }