aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-05-14 11:20:46 +0200
committerChristian Schneppe <christian@pix-art.de>2016-05-14 11:20:46 +0200
commite7736881ee770c2e5c0fb774ebbb31efc60ecbe0 (patch)
tree1a364bcd0e0f3a125253a75e4ace58bf9c029447 /src/main/java/eu/siacs/conversations/parser/AbstractParser.java
parent332df746f66e3557e2fe7603dcbd71600d03cece (diff)
revert changes to disable last-seen in UI
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/AbstractParser.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
index 73c717bf2..571fee065 100644
--- a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
@@ -48,12 +48,16 @@ public abstract class AbstractParser {
return dateFormat.parse(timestamp);
}
- protected void updateLastseen(long timestamp, final Account account, final Jid from) {
+ protected void updateLastseen(final AbstractStanza packet, final Account account, final boolean presenceOverwrite) {
+ updateLastseen(getTimestamp(packet), account, packet.getFrom(), presenceOverwrite);
+ }
+
+ protected void updateLastseen(long timestamp, final Account account, final Jid from, final boolean presenceOverwrite) {
final String presence = from == null || from.isBareJid() ? "" : from.getResourcepart();
final Contact contact = account.getRoster().getContact(from);
if (timestamp >= contact.lastseen.time) {
contact.lastseen.time = timestamp;
- if (!presence.isEmpty()) {
+ if (!presence.isEmpty() && presenceOverwrite) {
contact.lastseen.presence = presence;
}
}