From 999b9691cb83b0acff1c4656478483686f05d088 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 5 Mar 2014 21:04:11 +0100
Subject: two bugs on tablet fixed

---
 src/eu/siacs/conversations/ui/ConversationActivity.java | 2 +-
 src/eu/siacs/conversations/utils/PhoneHelper.java       | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/eu')

diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index d4d0e565..2fac2ede 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -417,7 +417,7 @@ public class ConversationActivity extends XmppActivity {
 			this.updateConversationList();
 		}
 
-		if ((getIntent().getAction().equals(Intent.ACTION_VIEW) && (!handledViewIntent))) {
+		if ((getIntent().getAction()!=null)&&(getIntent().getAction().equals(Intent.ACTION_VIEW) && (!handledViewIntent))) {
 			if (getIntent().getType().equals(
 					ConversationActivity.VIEW_CONVERSATION)) {
 				handledViewIntent = true;
diff --git a/src/eu/siacs/conversations/utils/PhoneHelper.java b/src/eu/siacs/conversations/utils/PhoneHelper.java
index e28f817e..5c652afe 100644
--- a/src/eu/siacs/conversations/utils/PhoneHelper.java
+++ b/src/eu/siacs/conversations/utils/PhoneHelper.java
@@ -81,7 +81,12 @@ public class PhoneHelper {
 			return null;
 		} else {
 			mProfileCursor.moveToFirst();
-			return Uri.parse(mProfileCursor.getString(1));
+			String uri = mProfileCursor.getString(1);
+			if (uri==null) {
+				return null;
+			} else {
+				return Uri.parse(uri);
+			}
 		}
 	}
 }
-- 
cgit v1.2.3