From 8632954e61c11bfa32cc192f0dcd4d3b2a72c7f0 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sat, 10 May 2014 11:03:32 +0200
Subject: fixed possible npe and possible exception

---
 src/eu/siacs/conversations/ui/ConversationFragment.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/eu')

diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 6850ac54..06bbc3a5 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -198,8 +198,12 @@ public class ConversationFragment extends Fragment {
 				boolean error = false;
 				if (message.getType() == Message.TYPE_IMAGE) {
 					String[] fileParams = message.getBody().split(",");
-					long size = Long.parseLong(fileParams[0]);
-					filesize = size / 1024 + " KB";
+					try {
+						long size = Long.parseLong(fileParams[0]);
+						filesize = size / 1024 + " KB";
+					} catch (NumberFormatException e) {
+						filesize = "0 KB";
+					}
 				}
 				switch (message.getStatus()) {
 				case Message.STATUS_UNSEND:
@@ -585,6 +589,9 @@ public class ConversationFragment extends Fragment {
 	}
 
 	public void updateMessages() {
+		if (getView()==null) {
+			return;
+		}
 		ConversationActivity activity = (ConversationActivity) getActivity();
 		if (this.conversation != null) {
 			for (Message message : this.conversation.getMessages()) {
-- 
cgit v1.2.3