From ca1ffdce5a1c1b3d570173bc060a0075fb157d50 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Mon, 21 May 2018 20:34:38 +0200 Subject: do not save draft if message is completly empty and fixed appending shared text --- src/main/java/de/pixart/messenger/entities/Conversation.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/pixart/messenger/entities/Conversation.java') diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index 98a847b09..05d0292a3 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -810,11 +810,12 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl return null; } - public boolean setNextMessage(String message) { + public boolean setNextMessage(final String input) { + final String message = input == null || input.trim().isEmpty() ? null : input; boolean changed = !getNextMessage().equals(message); this.setAttribute(ATTRIBUTE_NEXT_MESSAGE, message); if (changed) { - this.setAttribute(ATTRIBUTE_NEXT_MESSAGE_TIMESTAMP, TextUtils.isEmpty(message) ? 0 : System.currentTimeMillis()); + this.setAttribute(ATTRIBUTE_NEXT_MESSAGE_TIMESTAMP, message == null ? 0 : System.currentTimeMillis()); } return changed; } -- cgit v1.2.3