From 93f860d136b0193710358be4d7456dcc836310e5 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 4 Jan 2019 10:03:52 +0100 Subject: [PATCH] Removed limit on magic search results + fixed crash + removed uid from call display + fixed manually entered address in chat room creation being removed if security toggled --- app/src/main/java/org/linphone/call/CallOutgoingActivity.java | 2 +- .../main/java/org/linphone/chat/ChatRoomCreationFragment.java | 3 ++- app/src/main/java/org/linphone/contacts/ContactAddress.java | 2 +- app/src/main/java/org/linphone/contacts/ContactsManager.java | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java index b1ec73d70..17d2a9f81 100644 --- a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java +++ b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java @@ -192,7 +192,7 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC } else { mName.setText(LinphoneUtils.getAddressDisplayName(address)); } - mNumber.setText(address.asStringUriOnly()); + mNumber.setText(LinphoneUtils.getDisplayableAddress(address)); } @Override diff --git a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java index 570790447..fb6abb0e3 100644 --- a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java +++ b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java @@ -302,7 +302,8 @@ public class ChatRoomCreationFragment extends Fragment // and that can stay because they don't have the capability mContactsSelectedLayout.removeAllViews(); for (ContactAddress ca : mSearchAdapter.getContactsSelectedList()) { - if (!ca.hasCapability(FriendCapability.LimeX3Dh)) { + // If the ContactAddress doesn't have a contact keep it anyway + if (ca.getContact() != null && !ca.hasCapability(FriendCapability.LimeX3Dh)) { mSearchAdapter.toggleContactSelection(ca); } else { if (ca.getView() != null) { diff --git a/app/src/main/java/org/linphone/contacts/ContactAddress.java b/app/src/main/java/org/linphone/contacts/ContactAddress.java index 9d873ff8c..9bec5e07b 100644 --- a/app/src/main/java/org/linphone/contacts/ContactAddress.java +++ b/app/src/main/java/org/linphone/contacts/ContactAddress.java @@ -119,7 +119,7 @@ public class ContactAddress implements Serializable { } public boolean hasCapability(FriendCapability capability) { - return mContact.hasFriendCapability(capability); + return mContact != null && mContact.hasFriendCapability(capability); } private void init(LinphoneContact c, String a, String pn, boolean isLC) { diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.java b/app/src/main/java/org/linphone/contacts/ContactsManager.java index 0372c6e9e..8531906fe 100644 --- a/app/src/main/java/org/linphone/contacts/ContactsManager.java +++ b/app/src/main/java/org/linphone/contacts/ContactsManager.java @@ -86,6 +86,7 @@ public class ContactsManager extends ContentObserver implements FriendListListen if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) { mMagicSearch = LinphoneManager.getLcIfManagerNotDestroyedOrNull().createMagicSearch(); + mMagicSearch.setLimitedSearch(false); // Do not limit the number of results } }