diff --git a/src/org/linphone/ContactDetailsFragment.java b/src/org/linphone/ContactDetailsFragment.java index 3f23ba3e8..8146b3be6 100644 --- a/src/org/linphone/ContactDetailsFragment.java +++ b/src/org/linphone/ContactDetailsFragment.java @@ -36,7 +36,7 @@ import android.widget.TextView; /** * @author Sylvain Berfini */ -public class ContactDetailsFragment extends Fragment implements OnClickListener, ContactsUpdatedListener { +public class ContactDetailsFragment extends Fragment implements OnClickListener { private LinphoneContact contact; private ImageView editContact, deleteContact, back; private LayoutInflater inflater; @@ -106,12 +106,6 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener, contact = newContact; displayContact(inflater, view); } - - @Override - public void onContactsUpdated() { - contact.refresh(); - displayContact(inflater, view); - } @SuppressLint("InflateParams") private void displayContact(LayoutInflater inflater, View view) { @@ -211,16 +205,9 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener, } } - @Override - public void onPause() { - ContactsManager.removeContactsListener(this); - super.onPause(); - } - @Override public void onResume() { super.onResume(); - ContactsManager.addContactsListener(this); if (LinphoneActivity.isInstanciated()) { LinphoneActivity.instance().selectMenu(FragmentsAvailable.CONTACT_DETAIL); diff --git a/src/org/linphone/ContactsListFragment.java b/src/org/linphone/ContactsListFragment.java index fffe5afb8..8d208787b 100644 --- a/src/org/linphone/ContactsListFragment.java +++ b/src/org/linphone/ContactsListFragment.java @@ -51,7 +51,7 @@ import android.widget.TextView; * @author Sylvain Berfini */ @SuppressLint("DefaultLocale") -public class ContactsListFragment extends Fragment implements OnClickListener, OnItemClickListener, ContactsUpdatedListener { +public class ContactsListFragment extends Fragment implements OnClickListener, OnItemClickListener { private LayoutInflater mInflater; private ListView contactsList; private TextView noSipContact, noContact; @@ -369,7 +369,6 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O @Override public void onResume() { instance = this; - ContactsManager.addContactsListener(this); super.onResume(); if (editConsumed) { @@ -389,14 +388,8 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O @Override public void onPause() { instance = null; - ContactsManager.removeContactsListener(this); super.onPause(); } - - @Override - public void onContactsUpdated() { - invalidate(); - } public void invalidate() { if (searchField != null && searchField.getText().toString().length() > 0) { diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java index 5cda03f9c..0f665f99c 100644 --- a/src/org/linphone/ContactsManager.java +++ b/src/org/linphone/ContactsManager.java @@ -59,24 +59,12 @@ public class ContactsManager extends ContentObserver { if (msg.what == CONTACTS_UPDATED && msg.obj instanceof List) { List c = (List) msg.obj; ContactsManager.getInstance().setContacts(c); - for (ContactsUpdatedListener listener : contactsListeners) { - listener.onContactsUpdated(); - } } } }; - - private static ArrayList contactsListeners; - public static void addContactsListener(ContactsUpdatedListener listener) { - contactsListeners.add(listener); - } - public static void removeContactsListener(ContactsUpdatedListener listener) { - contactsListeners.remove(listener); - } private ContactsManager(Handler handler) { super(handler); - contactsListeners = new ArrayList(); } @Override @@ -86,7 +74,7 @@ public class ContactsManager extends ContentObserver { @Override public void onChange(boolean selfChange, Uri uri) { - List contacts = fetchContactsInBackground(); + List contacts = fetchContactsAsync(); Message msg = handler.obtainMessage(); msg.what = CONTACTS_UPDATED; msg.obj = contacts; @@ -199,7 +187,7 @@ public class ContactsManager extends ContentObserver { } } - public List fetchContactsInBackground() { + public List fetchContactsAsync() { List contacts = new ArrayList(); for (LinphoneFriend friend : LinphoneManager.getLc().getFriendList()) {