aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-05-16 12:07:58 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-05-16 12:07:58 +0200
commit1cf1e62e30bda954d14ac56070b2884a4235c319 (patch)
treea6fb1d4c1bf03c2744e14a7338127da046059c3f /src
parentafd1ba657aef5d7361a38ad24eee746250c2348e (diff)
fixed null in shared link
Diffstat (limited to 'src')
-rw-r--r--src/eu/siacs/conversations/entities/Conversation.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index 5674f84a..20c70d29 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -341,7 +341,11 @@ public class Conversation extends AbstractEntity {
}
public String getNextMessage() {
- return this.nextMessage;
+ if (this.nextMessage==null) {
+ return "";
+ } else {
+ return this.nextMessage;
+ }
}
public void setNextMessage(String message) {