From a72ffc3c3ad34c859ea1b8ddd8b6fc33de9eee74 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 26 Jul 2012 16:43:55 +0200 Subject: [PATCH] Updated linphone to fix missed call issues + update contacts management --- src/org/linphone/ContactFragment.java | 2 ++ src/org/linphone/LinphoneActivity.java | 4 ++-- src/org/linphone/compatibility/ApiFivePlus.java | 2 -- submodules/linphone | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/linphone/ContactFragment.java b/src/org/linphone/ContactFragment.java index 2a41bb84b..00d6b6cb8 100644 --- a/src/org/linphone/ContactFragment.java +++ b/src/org/linphone/ContactFragment.java @@ -42,6 +42,8 @@ public class ContactFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { contact = (Contact) getArguments().getSerializable("Contact"); + contact.setNumerosOrAddresses(Compatibility.extractContactNumbersAndAddresses(contact.getID(), getActivity().getContentResolver())); + View view = inflater.inflate(R.layout.contact, container, false); AvatarWithShadow contactPicture = (AvatarWithShadow) view.findViewById(R.id.contactPicture); diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 242dd6873..ca95e4023 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -108,8 +108,6 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene return; } - prepareContactsInBackground(); - boolean useFirstLoginActivity = getResources().getBoolean(R.bool.useFirstLoginActivity); SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this); if (useFirstLoginActivity && !pref.getBoolean(getString(R.string.first_launch_suceeded_once_key), false)) { @@ -668,6 +666,8 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene @Override protected void onResume() { super.onResume(); + + prepareContactsInBackground(); if (chatStorage != null) { chatStorage.close(); diff --git a/src/org/linphone/compatibility/ApiFivePlus.java b/src/org/linphone/compatibility/ApiFivePlus.java index 51add338c..ce12233f3 100644 --- a/src/org/linphone/compatibility/ApiFivePlus.java +++ b/src/org/linphone/compatibility/ApiFivePlus.java @@ -233,8 +233,6 @@ public class ApiFivePlus { contact = new Contact(id, name, photo, BitmapFactory.decodeStream(input)); } - contact.setNumerosOrAddresses(Compatibility.extractContactNumbersAndAddresses(contact.getID(), cr)); - return contact; } catch (Exception e) { diff --git a/submodules/linphone b/submodules/linphone index 75e09c961..14fc5446d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 75e09c9613844a8999d8ad3b3b908c3b27a7a10a +Subproject commit 14fc5446d03d5cf7a62e8884fa99fd7bbe175ecb