aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui/ConversationFragment.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-05-09 20:46:43 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-05-09 20:46:43 +0200
commita14a28973ada020234c60680a51cdff2f9129de9 (patch)
tree0023194f9d53d0db6f7844829e210e15d9b88663 /src/eu/siacs/conversations/ui/ConversationFragment.java
parentb0a0863ba2c23023b0b04d813b1dc30bd638735e (diff)
nicer descriptions in notificaton for images and encrypted messages
Diffstat (limited to 'src/eu/siacs/conversations/ui/ConversationFragment.java')
-rw-r--r--src/eu/siacs/conversations/ui/ConversationFragment.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index e06c9eeb..6850ac54 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -492,7 +492,9 @@ public class ConversationFragment extends Fragment {
@Override
public void onStop() {
super.onStop();
- this.conversation.setNextMessage(chatMsg.getText().toString());
+ if (this.conversation!=null) {
+ this.conversation.setNextMessage(chatMsg.getText().toString());
+ }
}
public void onBackendConnected() {