aboutsummaryrefslogtreecommitdiffstats
path: root/src/de/gultsch/chat/ui
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-02 17:53:34 +0100
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-02 17:53:34 +0100
commit3d9294684c739cc54de8dfa08ad22097ca8a1811 (patch)
tree28f5bd5b6f5dfa7c955db5a0b8ac25fc8bcfd443 /src/de/gultsch/chat/ui
parentbbdaf5b0bd7c42729aeba12f3b4ea4cabc794c4f (diff)
tls is no optional
Diffstat (limited to 'src/de/gultsch/chat/ui')
-rw-r--r--src/de/gultsch/chat/ui/ConversationFragment.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/de/gultsch/chat/ui/ConversationFragment.java b/src/de/gultsch/chat/ui/ConversationFragment.java
index d6398c823..990c38b6b 100644
--- a/src/de/gultsch/chat/ui/ConversationFragment.java
+++ b/src/de/gultsch/chat/ui/ConversationFragment.java
@@ -124,8 +124,11 @@ public class ConversationFragment extends Fragment {
} else {
imageView.setImageURI(profilePicture);
}
- ((TextView) view.findViewById(R.id.message_body)).setText(item
- .getBody().trim());
+ TextView messageBody = (TextView) view.findViewById(R.id.message_body);
+ String body = item.getBody();
+ if (body!=null) {
+ messageBody.setText(body.trim());
+ }
TextView time = (TextView) view.findViewById(R.id.message_time);
if (item.getStatus() == Message.STATUS_UNSEND) {
time.setTypeface(null, Typeface.ITALIC);