From 04530e1f64c8102c9f85b15f5691299393cd2315 Mon Sep 17 00:00:00 2001 From: Brieuc Viel Date: Wed, 20 Apr 2016 10:19:04 +0200 Subject: [PATCH] [Presence] test in progress + updates --- src/org/linphone/ContactsListFragment.java | 3 --- src/org/linphone/LinphoneActivity.java | 2 +- src/org/linphone/LinphoneContact.java | 13 ++++++++++--- src/org/linphone/LinphoneManager.java | 12 +++++++----- src/org/linphone/ui/AvatarWithPresenceImage.java | 5 +---- submodules/bctoolbox | 2 +- submodules/belcard | 2 +- submodules/bzrtp | 2 +- submodules/linphone | 2 +- 9 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/org/linphone/ContactsListFragment.java b/src/org/linphone/ContactsListFragment.java index f3a0c08e2..79ae359c1 100644 --- a/src/org/linphone/ContactsListFragment.java +++ b/src/org/linphone/ContactsListFragment.java @@ -414,7 +414,6 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O View view = null; LinphoneContact contact = (LinphoneContact) getItem(position); if (contact == null) return null; - Log.e("===>> getView - contact : isAndroidContact = "+contact.isAndroidContact()+" - is LinphoneFriend = "+contact.isLinphoneFriend()); contact.refresh(); if (convertView != null) { @@ -448,11 +447,9 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O if(contact != null ) { avatarWithPresenceImage.setLinphoneContact(contact); if (contact.isLinphoneFriend()) { - Log.e("===>> getView - contact != null"); LinphoneActivity.instance().addPresenceUpdatedListener(avatarWithPresenceImage); } }else { - Log.e("===>> getView - everything == null"); avatarWithPresenceImage.setLinphoneContact(contact); LinphoneActivity.instance().addPresenceUpdatedListener(avatarWithPresenceImage); } diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 940134588..6bd4eb846 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -287,7 +287,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta for(AvatarWithPresenceImage listener : listeners){ Log.e("===>> LinphoneActivity : notifyPresenceReceived 2 : "+lf.getName().toString()); if(listener.isThisFriend(lf)){ - listener.updatePresenceIcon(lc, lf); + listener.updatePresenceIcon(lc, lf); } } } diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java index 447e99fc5..87c4ad518 100644 --- a/src/org/linphone/LinphoneContact.java +++ b/src/org/linphone/LinphoneContact.java @@ -371,6 +371,13 @@ public class LinphoneContact implements Serializable, Comparable>> LinphoneContact : isAndroidContact & isLinphoneFriend : "); fullName = friend.getName(); thumbnailUri = null; photoUri = null; @@ -380,6 +387,7 @@ public class LinphoneContact implements Serializable, Comparable>> LinphoneContact : isAndroidContact : "+getFriendPresenceModel().toString()); String id = getAndroidId(); getContactNames(id); setThumbnailUri(getContactPictureUri(id)); @@ -422,9 +430,9 @@ public class LinphoneContact implements Serializable, Comparable>> LinphoneContact - isLinphoneFriend :" + getFriendPresenceModel().toString()); } } @@ -442,7 +450,6 @@ public class LinphoneContact implements Serializable, Comparable> getFriendPresenceModel - friend != null : "+friend.getPresenceModel()); return friend.getPresenceModel(); } else return null; diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 2b81c0cf2..417cfa17b 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -352,11 +352,13 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag private void enableProxyPublish( boolean enabled) { LinphoneCore lc = getLcIfManagerNotDestroyedOrNull(); - LinphoneProxyConfig[] proxyList = lc.getProxyConfigList(); - for (LinphoneProxyConfig proxyConfig : proxyList){ - proxyConfig.edit(); - proxyConfig.enablePublish(enabled); - proxyConfig.done(); + if(lc != null ) { + LinphoneProxyConfig[] proxyList = lc.getProxyConfigList(); + for (LinphoneProxyConfig proxyConfig : proxyList) { + proxyConfig.edit(); + proxyConfig.enablePublish(enabled); + proxyConfig.done(); + } } } diff --git a/src/org/linphone/ui/AvatarWithPresenceImage.java b/src/org/linphone/ui/AvatarWithPresenceImage.java index a299aa226..b61fbc92d 100644 --- a/src/org/linphone/ui/AvatarWithPresenceImage.java +++ b/src/org/linphone/ui/AvatarWithPresenceImage.java @@ -92,11 +92,10 @@ public class AvatarWithPresenceImage extends RelativeLayout implements onPresenc friendStatusBig = (ImageView) this.findViewById(R.id.friend_status_big); PresenceModel presenceModel = contact.getFriendPresenceModel(); PresenceBasicStatus basicStatus = presenceModel.getBasicStatus(); - + Log.e("===>>> updateAvatarPresence basicStatus = "+ presenceModel.getBasicStatus().toString()+" - "+ presenceModel.getActivity().getType().toString()); if (basicStatus == PresenceBasicStatus.Closed) { friendStatusSmall.setImageResource(R.drawable.presence_unregistered); friendStatusBig.setImageResource(R.drawable.presence_unregistered); - Log.e("===>>> updateAvatarPresence basicStatus == Closed"); } else if (presenceModel.getActivity().getType() == PresenceActivityType.TV ) { friendStatusSmall.setImageResource(R.drawable.presence_online); friendStatusBig.setImageResource(R.drawable.presence_online); @@ -105,11 +104,9 @@ public class AvatarWithPresenceImage extends RelativeLayout implements onPresenc friendStatusBig.setImageResource(R.drawable.presence_offline); } } else if(contact.isLinphoneFriend()){ - Log.e("===>>> updateAvatarPresence friend infromation is null "); friendStatusSmall.setImageResource(R.drawable.presence_offline); friendStatusBig.setImageResource(R.drawable.presence_offline); } else{ - Log.e("===>>> updateAvatarPresence friend is null "); friendStatusSmall.setImageResource(R.drawable.presence_unregistered); friendStatusSmall.setImageResource(R.drawable.presence_unregistered); } diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 29e865b55..d5e453b0c 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 29e865b5566890ae1ba3a50b0699337ef926d6b5 +Subproject commit d5e453b0c45154d424a7b80617fce380fe7d3c4c diff --git a/submodules/belcard b/submodules/belcard index 129a9f0cb..da7030bb3 160000 --- a/submodules/belcard +++ b/submodules/belcard @@ -1 +1 @@ -Subproject commit 129a9f0cbb880361d1f10c08fd4c2bd188ec0565 +Subproject commit da7030bb322f4cd74638e6710007b1470c1b602e diff --git a/submodules/bzrtp b/submodules/bzrtp index 8a82f7a64..5a6196e3d 160000 --- a/submodules/bzrtp +++ b/submodules/bzrtp @@ -1 +1 @@ -Subproject commit 8a82f7a645765480a90f41ce18c85cf9a62dcc14 +Subproject commit 5a6196e3d0a5d5b2998522379c9fdc2788378570 diff --git a/submodules/linphone b/submodules/linphone index f0cd38ef2..16e21507b 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f0cd38ef228cf26bfdd0fd8bd037fd74fb1e1c5a +Subproject commit 16e21507be68b24d8beb95775fe639a903efcefe