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

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

Browse source
This commit is contained in:
Sylvain Berfini 2019-01-04 10:03:52 +01:00
parent 19359e03a0
commit 93f860d136
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/call/CallOutgoingActivity.java
View file

@ -192,7 +192,7 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC
} else { } else {
mName.setText(LinphoneUtils.getAddressDisplayName(address)); mName.setText(LinphoneUtils.getAddressDisplayName(address));
} }
mNumber.setText(address.asStringUriOnly()); mNumber.setText(LinphoneUtils.getDisplayableAddress(address));
} }
@Override @Override

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

@ -302,7 +302,8 @@ public class ChatRoomCreationFragment extends Fragment
// and that can stay because they don't have the capability // and that can stay because they don't have the capability
mContactsSelectedLayout.removeAllViews(); mContactsSelectedLayout.removeAllViews();
for (ContactAddress ca : mSearchAdapter.getContactsSelectedList()) { 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); mSearchAdapter.toggleContactSelection(ca);
} else { } else {
if (ca.getView() != null) { if (ca.getView() != null) {

2
app/src/main/java/org/linphone/contacts/ContactAddress.java
View file

@ -119,7 +119,7 @@ public class ContactAddress implements Serializable {
} }
public boolean hasCapability(FriendCapability capability) { 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) { private void init(LinphoneContact c, String a, String pn, boolean isLC) {

1
app/src/main/java/org/linphone/contacts/ContactsManager.java
View file

@ -86,6 +86,7 @@ public class ContactsManager extends ContentObserver implements FriendListListen
if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) { if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) {
mMagicSearch = LinphoneManager.getLcIfManagerNotDestroyedOrNull().createMagicSearch(); mMagicSearch = LinphoneManager.getLcIfManagerNotDestroyedOrNull().createMagicSearch();
mMagicSearch.setLimitedSearch(false); // Do not limit the number of results
} }
} }