From cef2eb58a76ee11b277c3d861d57cb4684e81fef Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 3 May 2016 22:16:51 +0200 Subject: [PATCH] fixed presence template dedup for 'online' status --- .../java/eu/siacs/conversations/entities/PresenceTemplate.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java b/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java index dd45d7e46..3b3ce08db 100644 --- a/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java +++ b/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java @@ -28,10 +28,11 @@ public class PresenceTemplate extends AbstractEntity { @Override public ContentValues getContentValues() { + final String show = status.toShowString(); ContentValues values = new ContentValues(); values.put(LAST_USED, lastUsed); values.put(MESSAGE, statusMessage); - values.put(STATUS, status.toShowString()); + values.put(STATUS, show == null ? "" : show); values.put(UUID, uuid); return values; }