aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-03-05 21:04:11 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-03-05 21:04:11 +0100
commit999b9691cb83b0acff1c4656478483686f05d088 (patch)
tree5a622ca1433e85275fa1f0e4d75f5cb7c1256db8 /src/eu
parentb3f038b700f2a84b4283df84d17f4cb6174b228e (diff)
two bugs on tablet fixed
Diffstat (limited to 'src/eu')
-rw-r--r--src/eu/siacs/conversations/ui/ConversationActivity.java2
-rw-r--r--src/eu/siacs/conversations/utils/PhoneHelper.java7
2 files changed, 7 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index d4d0e5655..2fac2ede5 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 e28f817e7..5c652afea 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);
+ }
}
}
}