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
This commit is contained in:
parent
19359e03a0
commit
93f860d136
4 changed files with 5 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue