aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Contact.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-10-07 10:05:08 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-10-07 10:05:08 +0200
commit1f7f82da7b4e98e76588721d16ebf2b3e42e9084 (patch)
treec2196a384e58ef9c33087cf757a1a39ec2d0bbc7 /src/main/java/eu/siacs/conversations/entities/Contact.java
parent26e33de79aad9bd688e1fdfdf0108a962cdc3244 (diff)
respond to chat marker request only when mutual presence subscription exists
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Contact.java')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Contact.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index e512b586..70af45d4 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -118,7 +118,7 @@ public class Contact implements ListItem, Blockable {
return this.systemName;
} else if (this.serverName != null) {
return this.serverName;
- } else if (this.presenceName != null && trusted()) {
+ } else if (this.presenceName != null && mutualPresenceSubscription()) {
return this.presenceName;
} else if (jid.hasLocalpart()) {
return jid.getLocalpart();
@@ -487,7 +487,7 @@ public class Contact implements ListItem, Blockable {
}
}
- public boolean trusted() {
+ public boolean mutualPresenceSubscription() {
return getOption(Options.FROM) && getOption(Options.TO);
}