Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed crash if search result doesn't have an address

Browse source
This commit is contained in:
Sylvain Berfini 2019-01-02 11:21:37 +01:00
parent 31e81fdd91
commit ad7a9e351e
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
View file

@ -598,9 +598,19 @@ public class ChatRoomCreationFragment extends Fragment
mChatRoom.getPeerAddress().asStringUriOnly(), mShareInfos); mChatRoom.getPeerAddress().asStringUriOnly(), mShareInfos);
} }
} else { } else {
ChatRoom chatRoom = lc.getChatRoom(searchResult.getAddress()); Address address = searchResult.getAddress();
LinphoneActivity.instance() if (address == null) {
.goToChat(chatRoom.getPeerAddress().asStringUriOnly(), mShareInfos); Log.w("[Chat Room Creation] Using search result without an address...");
address = lc.interpretUrl(searchResult.getPhoneNumber());
}
if (address != null) {
ChatRoom chatRoom = lc.getChatRoom(address);
LinphoneActivity.instance()
.goToChat(chatRoom.getPeerAddress().asStringUriOnly(), mShareInfos);
} else {
Log.e(
"[Chat Room Creation] Can't create a chat room without a valid address !");
}
} }
} }
} else { } else {

5
app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java
View file

@ -228,11 +228,6 @@ public class SearchContactsAdapter extends RecyclerView.Adapter<SearchContactVie
.getContactListFromFilter(search, mOnlySipContact ? domain : ""); .getContactListFromFilter(search, mOnlySipContact ? domain : "");
for (SearchResult sr : searchResults) { for (SearchResult sr : searchResults) {
if (sr.getAddress() != null) {
Log.e("### " + sr.getPhoneNumber() + " / " + sr.getAddress().asString());
} else {
Log.e("### " + sr.getPhoneNumber());
}
if (LinphoneActivity.instance() if (LinphoneActivity.instance()
.getResources() .getResources()
.getBoolean(R.bool.hide_sip_contacts_without_presence)) { .getBoolean(R.bool.hide_sip_contacts_without_presence)) {