From 3d9294684c739cc54de8dfa08ad22097ca8a1811 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 2 Feb 2014 17:53:34 +0100 Subject: tls is no optional --- src/de/gultsch/chat/ui/ConversationFragment.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/de/gultsch/chat/ui') 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); -- cgit v1.2.3