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

Updated linphone to fix missed call issues + update contacts management

Browse source
This commit is contained in:
Sylvain Berfini 2012-07-26 16:43:55 +02:00
parent 9a77d2f070
commit a72ffc3c3a
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/ContactFragment.java
View file

@ -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);

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

@ -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();

2
src/org/linphone/compatibility/ApiFivePlus.java
View file

@ -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) {

2
submodules/linphone

@ -1 +1 @@
Subproject commit 75e09c9613844a8999d8ad3b3b908c3b27a7a10a
Subproject commit 14fc5446d03d5cf7a62e8884fa99fd7bbe175ecb