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

Use the newest customisations in chatroom creation list

Browse source 
(cherry picked from commit dba14a0bb921a8f76a23d71beb4985afda30ed2e)
This commit is contained in:
Mickaël Turnel 2018-10-16 14:55:20 +02:00
parent dff64293ea
commit 4dd16231ef
2 changed files with 55 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/android/org/linphone/chat/ChatCreationFragment.java
View file

@ -239,18 +239,35 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
mContactsList.setVisibility(View.VISIBLE); mContactsList.setVisibility(View.VISIBLE);
mSearchLayout.setVisibility(View.VISIBLE); mSearchLayout.setVisibility(View.VISIBLE);
mAllContactsButton.setVisibility(View.VISIBLE);
mLinphoneContactsButton.setVisibility(View.VISIBLE);
if (mOnlyDisplayLinphoneContacts) {
mAllContactsSelected.setVisibility(View.INVISIBLE);
mLinphoneContactsSelected.setVisibility(View.VISIBLE);
} else {
mAllContactsSelected.setVisibility(View.VISIBLE);
mLinphoneContactsSelected.setVisibility(View.INVISIBLE);
}
mAllContactsButton.setEnabled(mOnlyDisplayLinphoneContacts); if (getResources().getBoolean(R.bool.hide_non_linphone_contacts)) {
mLinphoneContactsButton.setEnabled(!mAllContactsButton.isEnabled()); mLinphoneContactsButton.setVisibility(View.INVISIBLE);
mAllContactsButton.setEnabled(false);
mLinphoneContactsButton.setEnabled(false);
mOnlyDisplayLinphoneContacts = true;
mAllContactsButton.setOnClickListener(null);
mLinphoneContactsButton.setOnClickListener(null);
mLinphoneContactsSelected.setVisibility(View.INVISIBLE);
mLinphoneContactsSelected.setVisibility(View.INVISIBLE);
} else {
mAllContactsButton.setVisibility(View.VISIBLE);
mLinphoneContactsButton.setVisibility(View.VISIBLE);
if (mOnlyDisplayLinphoneContacts) {
mAllContactsSelected.setVisibility(View.INVISIBLE);
mLinphoneContactsSelected.setVisibility(View.VISIBLE);
} else {
mAllContactsSelected.setVisibility(View.VISIBLE);
mLinphoneContactsSelected.setVisibility(View.INVISIBLE);
}
mAllContactsButton.setEnabled(mOnlyDisplayLinphoneContacts);
mLinphoneContactsButton.setEnabled(!mAllContactsButton.isEnabled());
}
mContactsSelectedLayout.removeAllViews(); mContactsSelectedLayout.removeAllViews();
if (mContactsSelected.size() > 0) { if (mContactsSelected.size() > 0) {

31
src/android/org/linphone/contacts/SearchContactsListAdapter.java
View file

@ -34,8 +34,11 @@ import org.linphone.R;
import org.linphone.activities.LinphoneActivity; import org.linphone.activities.LinphoneActivity;
import org.linphone.core.Address; import org.linphone.core.Address;
import org.linphone.core.Factory; import org.linphone.core.Factory;
import org.linphone.core.PresenceBasicStatus;
import org.linphone.core.PresenceModel;
import org.linphone.core.ProxyConfig; import org.linphone.core.ProxyConfig;
import org.linphone.core.SearchResult; import org.linphone.core.SearchResult;
import org.linphone.mediastream.Log;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -251,6 +254,7 @@ public class SearchContactsListAdapter extends RecyclerView.Adapter<SearchContac
String domain = ""; String domain = "";
ProxyConfig prx = LinphoneManager.getLc().getDefaultProxyConfig(); ProxyConfig prx = LinphoneManager.getLc().getDefaultProxyConfig();
if (prx != null) domain = prx.getDomain(); if (prx != null) domain = prx.getDomain();
Log.i("mOnlySipContact: " + mOnlySipContact + ", domain: " + domain);
SearchResult[] results = ContactsManager.getInstance().getMagicSearch().getContactListFromFilter(search, mOnlySipContact ? domain : ""); SearchResult[] results = ContactsManager.getInstance().getMagicSearch().getContactListFromFilter(search, mOnlySipContact ? domain : "");
for (SearchResult sr : results) { for (SearchResult sr : results) {
boolean found = false; boolean found = false;
@ -275,10 +279,29 @@ public class SearchContactsListAdapter extends RecyclerView.Adapter<SearchContac
} }
} }
if (!found) { if (!found) {
result.add(new ContactAddress(contact, if (LinphoneActivity.instance().getResources().getBoolean(R.bool.hide_sip_contacts_without_presence)) {
(sr.getAddress() != null) ? sr.getAddress().asStringUriOnly() : "", if (contact.getFriend() != null) {
sr.getPhoneNumber(), for (LinphoneNumberOrAddress noa : contact.getNumbersOrAddresses()) {
contact.isFriend())); PresenceModel pm = contact.getFriend().getPresenceModelForUriOrTel(noa.getValue());
if (pm != null && pm.getBasicStatus().equals(PresenceBasicStatus.Open)) {
result.add(new ContactAddress(contact,
(sr.getAddress() != null) ? sr.getAddress().asStringUriOnly() : "",
sr.getPhoneNumber(),
contact.isFriend()));
break;
}
}
}
} else {
result.add(new ContactAddress(contact,
(sr.getAddress() != null) ? sr.getAddress().asStringUriOnly() : "",
sr.getPhoneNumber(),
contact.isFriend()));
}
Log.i("AJOUT CONTACT: " + contact.getFirstName());
for(LinphoneNumberOrAddress a : contact.getNumbersOrAddresses()) {
Log.i("\t" + a.getValue() + "(" + a.getNormalizedPhone() + ")");
}
} }
} }