opt-in to send last userinteraction in presence

3 files changed, 41 insertions, 23 deletions

diff --git a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
index 03f19ed8..4699d286 100644
--- a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
@@ -1,9 +1,7 @@
 package eu.siacs.conversations.parser;
 
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Locale;
 
 import eu.siacs.conversations.entities.Account;
@@ -14,7 +12,6 @@ import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.jid.InvalidJidException;
 import eu.siacs.conversations.xmpp.jid.Jid;
-import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
 
 public abstract class AbstractParser {
 
@@ -24,42 +21,48 @@ public abstract class AbstractParser {
 		this.mXmppConnectionService = service;
 	}
 
-	public static Long getTimestamp(Element element, Long defaultValue) {
+	public static Long parseTimestamp(Element element, Long d) {
 		Element delay = element.findChild("delay","urn:xmpp:delay");
 		if (delay != null) {
 			String stamp = delay.getAttribute("stamp");
 			if (stamp != null) {
 				try {
-					return AbstractParser.parseTimestamp(delay.getAttribute("stamp")).getTime();
+					return AbstractParser.parseTimestamp(delay.getAttribute("stamp"));
 				} catch (ParseException e) {
-					return defaultValue;
+					return d;
 				}
 			}
 		}
-		return defaultValue;
+		return d;
 	}
 
-	protected long getTimestamp(Element packet) {
-		return getTimestamp(packet,System.currentTimeMillis());
+	public static long parseTimestamp(Element element) {
+		return parseTimestamp(element, System.currentTimeMillis());
 	}
 
-	public static Date parseTimestamp(String timestamp) throws ParseException {
+	public static long parseTimestamp(String timestamp) throws ParseException {
 		timestamp = timestamp.replace("Z", "+0000");
 		SimpleDateFormat dateFormat;
+		long ms;
+		if (timestamp.charAt(19) == '.' && timestamp.length() >= 25) {
+			String millis = timestamp.substring(19,timestamp.length() - 5);
+			try {
+				double fractions = Double.parseDouble("0" + millis);
+				ms = Math.round(1000 * fractions);
+			} catch (NumberFormatException e) {
+				ms = 0;
+			}
+		} else {
+			ms = 0;
+		}
 		timestamp = timestamp.substring(0,19)+timestamp.substring(timestamp.length() -5,timestamp.length());
 		dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ",Locale.US);
-		return dateFormat.parse(timestamp);
+		return Math.min(dateFormat.parse(timestamp).getTime()+ms, System.currentTimeMillis());
 	}
 
-	protected void updateLastseen(long timestamp, final Account account, final Jid from) {
-		final String presence = from == null || from.isBareJid() ? "" : from.getResourcepart();
+	protected void updateLastseen(final Account account, final Jid from) {
 		final Contact contact = account.getRoster().getContact(from);
-		if (timestamp >= contact.lastseen.time) {
-			contact.lastseen.time = timestamp;
-			if (!presence.isEmpty()) {
-				contact.lastseen.presence = presence;
-			}
-		}
+		contact.setLastPresence(from.isBareJid() ? "" : from.getResourcepart());
 	}
 
 	protected String avatarData(Element items) {
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 48862c47..2bdb747d 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -7,12 +7,12 @@ import android.util.Pair;
 import net.java.otr4j.session.Session;
 import net.java.otr4j.session.SessionStatus;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
 
@@ -32,6 +32,7 @@ import eu.siacs.conversations.http.HttpConnectionManager;
 import eu.siacs.conversations.services.MessageArchiveService;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.utils.CryptoHelper;
+import eu.siacs.conversations.utils.Xmlns;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.OnMessagePacketReceived;
 import eu.siacs.conversations.xmpp.chatstate.ChatState;
@@ -328,7 +329,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 		}
 
 		if (timestamp == null) {
-			timestamp = AbstractParser.getTimestamp(packet, System.currentTimeMillis());
+			timestamp = AbstractParser.parseTimestamp(packet);
 		}
 		final String body = packet.getBody();
 		final Element mucUserElement = packet.findChild("x", "http://jabber.org/protocol/muc#user");
@@ -439,7 +440,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 					message.setType(Message.TYPE_PRIVATE);
 				}
 			} else {
-				updateLastseen(timestamp, account, from);
+				updateLastseen(account, from);
 			}
 
 			if (replacementId != null && mXmppConnectionService.allowMessageCorrection()) {
@@ -601,7 +602,6 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 					mXmppConnectionService.markRead(conversation);
 				}
 			} else {
-				updateLastseen(timestamp, account, from);
 				final Message displayedMessage = mXmppConnectionService.markMessage(account, from.toBareJid(), displayed.getAttribute("id"), Message.STATUS_SEND_DISPLAYED);
 				Message message = displayedMessage == null ? null : displayedMessage.prev();
 				while (message != null
diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index b5718b61..b11a6eff 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
@@ -2,6 +2,7 @@ package eu.siacs.conversations.parser;
 
 import android.util.Log;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -206,6 +207,20 @@ public class PresenceParser extends AbstractParser implements
 				mXmppConnectionService.fetchCaps(account, from, presence);
 			}
 
+			final Element idle = packet.findChild("idle","urn:xmpp:idle:1");
+			if (idle != null) {
+				contact.flagInactive();
+				String since = idle.getAttribute("since");
+				try {
+					contact.setLastseen(AbstractParser.parseTimestamp(since));
+				} catch (NullPointerException | ParseException e) {
+					contact.setLastseen(System.currentTimeMillis());
+				}
+			} else {
+				contact.flagActive();
+				contact.setLastseen(AbstractParser.parseTimestamp(packet));
+			}
+
 			PgpEngine pgp = mXmppConnectionService.getPgpEngine();
 			Element x = packet.findChild("x", "jabber:x:signed");
 			if (pgp != null && x != null) {