aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/entities/Contact.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-01-25 23:32:52 +0100
committerChristian Schneppe <christian@pix-art.de>2019-01-25 23:32:52 +0100
commit3a5e1fd0c3805c7acb6b869fc03e1b76b0bf494f (patch)
tree28964748d34fcf13d08de3a6c4c84a154c8b7761 /src/main/java/de/pixart/messenger/entities/Contact.java
parentb670a7fb91b6a0b8fc2fbbc44688f4ccf66757b7 (diff)
resend presence to muc avatar update
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities/Contact.java')
-rw-r--r--src/main/java/de/pixart/messenger/entities/Contact.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Contact.java b/src/main/java/de/pixart/messenger/entities/Contact.java
index aa7319ad9..3ee636fe4 100644
--- a/src/main/java/de/pixart/messenger/entities/Contact.java
+++ b/src/main/java/de/pixart/messenger/entities/Contact.java
@@ -463,10 +463,14 @@ public class Contact implements ListItem, Blockable {
}
public boolean setAvatar(Avatar avatar) {
+ return setAvatar(avatar, false);
+ }
+
+ public boolean setAvatar(Avatar avatar, boolean previouslyOmittedPepFetch) {
if (this.avatar != null && this.avatar.equals(avatar)) {
return false;
} else {
- if (this.avatar != null && this.avatar.origin == Avatar.Origin.PEP && avatar.origin == Avatar.Origin.VCARD) {
+ if (!previouslyOmittedPepFetch && this.avatar != null && this.avatar.origin == Avatar.Origin.PEP && avatar.origin == Avatar.Origin.VCARD) {
return false;
}
this.avatar = avatar;