two bugs on tablet fixed

Daniel Gultsch created 12 years ago

Change summary

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

Detailed changes

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;

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);
+			}
 		}
 	}
 }