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

Avoid duplicate contacts for all and sip lists

Browse source
This commit is contained in:
Sylvain Berfini 2012-10-08 17:14:22 +02:00
parent e9f10c0b26
commit 92b53bf73d
2 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/org/linphone/ContactsFragment.java
View file

@ -188,7 +188,6 @@ public class ContactsFragment extends Fragment implements OnClickListener, OnIte
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
lastKnownPosition = contactsList.getFirstVisiblePosition();
changeContactsAdapter(); changeContactsAdapter();
contactsList.setSelectionFromTop(lastKnownPosition, 0); contactsList.setSelectionFromTop(lastKnownPosition, 0);
} }
@ -263,7 +262,7 @@ public class ContactsFragment extends Fragment implements OnClickListener, OnIte
ImageView friendStatus = (ImageView) view.findViewById(R.id.friendStatus); ImageView friendStatus = (ImageView) view.findViewById(R.id.friendStatus);
LinphoneFriend friend = contact.getFriend(); LinphoneFriend friend = contact.getFriend();
if (friend != null) { if (!LinphoneActivity.instance().isContactPresenceDisabled() && friend != null) {
friendStatus.setVisibility(View.VISIBLE); friendStatus.setVisibility(View.VISIBLE);
if (friend.getStatus() == OnlineStatus.Online) { if (friend.getStatus() == OnlineStatus.Online) {
friendStatus.setImageResource(R.drawable.led_connected); friendStatus.setImageResource(R.drawable.led_connected);

45
src/org/linphone/LinphoneActivity.java
View file

@ -104,7 +104,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
private Fragment dialerFragment, messageListenerFragment, messageListFragment, friendStatusListenerFragment; private Fragment dialerFragment, messageListenerFragment, messageListFragment, friendStatusListenerFragment;
private SavedState dialerSavedState; private SavedState dialerSavedState;
private ChatStorage chatStorage; private ChatStorage chatStorage;
private boolean preferLinphoneContacts = false, isAnimationDisabled = false; private boolean preferLinphoneContacts = false, isAnimationDisabled = false, isContactPresenceDisabled = true;
private Handler mHandler = new Handler(); private Handler mHandler = new Handler();
private List<Contact> contactList, sipContactList; private List<Contact> contactList, sipContactList;
private Cursor contactCursor, sipContactCursor; private Cursor contactCursor, sipContactCursor;
@ -294,13 +294,18 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
private void updateAnimationsState() { private void updateAnimationsState() {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
isAnimationDisabled = getApplicationContext().getResources().getBoolean(R.bool.disable_animations) || !prefs.getBoolean(getString(R.string.pref_animation_enable_key), false); isAnimationDisabled = getResources().getBoolean(R.bool.disable_animations) || !prefs.getBoolean(getString(R.string.pref_animation_enable_key), false);
isContactPresenceDisabled = !getResources().getBoolean(R.bool.enable_linphone_friends);
} }
public boolean isAnimationDisabled() { public boolean isAnimationDisabled() {
return isAnimationDisabled; return isAnimationDisabled;
} }
public boolean isContactPresenceDisabled() {
return isContactPresenceDisabled;
}
private void changeFragment(Fragment newFragment, FragmentsAvailable newFragmentType, boolean withoutAnimation) { private void changeFragment(Fragment newFragment, FragmentsAvailable newFragmentType, boolean withoutAnimation) {
if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) { if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) {
if (newFragmentType == FragmentsAvailable.DIALER) { if (newFragmentType == FragmentsAvailable.DIALER) {
@ -938,8 +943,11 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
} }
public void onNewSubscriptionRequestReceived(LinphoneFriend friend, String sipUri) { public void onNewSubscriptionRequestReceived(LinphoneFriend friend, String sipUri) {
if (isContactPresenceDisabled) {
return;
}
sipUri = sipUri.replace("<", "").replace(">", ""); sipUri = sipUri.replace("<", "").replace(">", "");
Log.d("New friend request from " + sipUri);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
if (prefs.getBoolean(getString(R.string.pref_auto_accept_friends_key), false)) { if (prefs.getBoolean(getString(R.string.pref_auto_accept_friends_key), false)) {
Contact contact = findContactWithSipAddress(sipUri); Contact contact = findContactWithSipAddress(sipUri);
@ -978,14 +986,12 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
} }
public void onNotifyPresenceReceived(LinphoneFriend friend) { public void onNotifyPresenceReceived(LinphoneFriend friend) {
Log.d("friend " + friend.getAddress() + " has a new status: " + friend.getStatus().toString()); if (!isContactPresenceDisabled && currentFragment == FragmentsAvailable.CONTACTS && friendStatusListenerFragment != null) {
if (currentFragment == FragmentsAvailable.CONTACTS && friendStatusListenerFragment != null) {
((ContactsFragment) friendStatusListenerFragment).invalidate(); ((ContactsFragment) friendStatusListenerFragment).invalidate();
} }
} }
public boolean newFriend(Contact contact, String sipUri) { public boolean newFriend(Contact contact, String sipUri) {
Log.d("Adding friend :" + sipUri + " associated with contact " + contact.getName());
LinphoneFriend friend = LinphoneCoreFactory.instance().createLinphoneFriend(sipUri); LinphoneFriend friend = LinphoneCoreFactory.instance().createLinphoneFriend(sipUri);
friend.enableSubscribes(true); friend.enableSubscribes(true);
friend.setIncSubscribePolicy(LinphoneFriend.SubscribePolicy.SPAccept); friend.setIncSubscribePolicy(LinphoneFriend.SubscribePolicy.SPAccept);
@ -1007,7 +1013,6 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
} }
public boolean removeFriend(Contact contact, String sipUri) { public boolean removeFriend(Contact contact, String sipUri) {
Log.d("Removing friend :" + sipUri + " associated with contact " + contact.getName());
LinphoneFriend friend = LinphoneManager.getLc().findFriendByAddress(sipUri); LinphoneFriend friend = LinphoneManager.getLc().findFriendByAddress(sipUri);
if (friend != null) { if (friend != null) {
friend.enableSubscribes(false); friend.enableSubscribes(false);
@ -1041,26 +1046,24 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
sipContactCursor = Compatibility.getSIPContactsCursor(getContentResolver()); sipContactCursor = Compatibility.getSIPContactsCursor(getContentResolver());
contactList = new ArrayList<Contact>(); contactList = new ArrayList<Contact>();
sipContactList = new ArrayList<Contact>(); sipContactList = new ArrayList<Contact>();
Thread sipContactsHandler = new Thread(new Runnable() {
@Override
public void run() {
for (int i = 0; i < sipContactCursor.getCount(); i++) {
Contact contact = Compatibility.getContact(getContentResolver(), sipContactCursor, i);
contact.refresh(getContentResolver());
if (getResources().getBoolean(R.bool.enable_linphone_friends)) {
searchFriendAndAddToContact(contact);
}
sipContactList.add(contact);
}
}
});
sipContactsHandler.start();
Thread contactsHandler = new Thread(new Runnable() { Thread contactsHandler = new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
for (int i = 0; i < contactCursor.getCount(); i++) { for (int i = 0; i < contactCursor.getCount(); i++) {
Contact contact = Compatibility.getContact(getContentResolver(), contactCursor, i); Contact contact = Compatibility.getContact(getContentResolver(), contactCursor, i);
contact.refresh(getContentResolver());
for (String aon : contact.getNumerosOrAddresses()) {
if (LinphoneUtils.isSipAddress(aon)) {
if (!isContactPresenceDisabled) {
searchFriendAndAddToContact(contact);
}
if (!sipContactList.contains(contact)) {
sipContactList.add(contact);
}
}
}
contactList.add(contact); contactList.add(contact);
} }
} }