mirror of
https://github.com/moparisthebest/Conversations
synced 2024-11-04 16:25:06 -05:00
two bugs on tablet fixed
This commit is contained in:
parent
b3f038b700
commit
999b9691cb
@ -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;
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user