aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-07-17 22:51:40 +0200
committerChristian Schneppe <christian@pix-art.de>2016-07-25 19:45:51 +0200
commitd32a03fe52592d3863abde1fa051f0426265b1a2 (patch)
tree9424c9625e01a2aac9d7c0c14091860888561373 /src/main/java/eu/siacs
parentf98e2ac49bdb0c51b3219484d0a86e003759b803 (diff)
announce OTR support as per XEP-0378
Diffstat (limited to 'src/main/java/eu/siacs')
-rw-r--r--src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
index 4efec8c37..f071db3c0 100644
--- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
@@ -45,6 +45,9 @@ public abstract class AbstractGenerator {
private final String[] PRIVACY_SENSITIVE = {
"urn:xmpp:time" //XEP-0202: Entity Time leaks time zone
};
+ private final String[] OTR = {
+ "urn:xmpp:otr:0"
+ };
private String mVersion = null;
private String mVersionOs = null;
@@ -115,6 +118,9 @@ public abstract class AbstractGenerator {
if (!mXmppConnectionService.useTorToConnect()) {
features.addAll(Arrays.asList(PRIVACY_SENSITIVE));
}
+ if (Config.supportOtr()) {
+ features.addAll(Arrays.asList(OTR));
+ }
Collections.sort(features);
return features;
}