narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

two bugs on tablet fixed

Browse source
This commit is contained in:
Daniel Gultsch 2014-03-05 21:04:11 +01:00
parent b3f038b700
commit 999b9691cb
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -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;

7
src/eu/siacs/conversations/utils/PhoneHelper.java
View file

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