From f7611055726c09fe6d3717d985772c7e9ad3c0ff Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Fri, 31 Oct 2014 15:55:44 +0100 Subject: [PATCH] Add contact image in history --- src/org/linphone/ChatFragment.java | 6 ------ src/org/linphone/EditContactFragment.java | 1 - src/org/linphone/HistoryDetailFragment.java | 9 ++++++++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java index b28d64b28..cbfc06ca8 100644 --- a/src/org/linphone/ChatFragment.java +++ b/src/org/linphone/ChatFragment.java @@ -682,12 +682,6 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC } }); } else if (message.getExternalBodyUrl() != null) { - if (!useLinphoneMessageStorage) { - byte[] rawImage = LinphoneActivity.instance().getChatStorage().getRawImageFromMessage(id); - if (rawImage != null) { - Bitmap bm = BitmapFactory.decodeByteArray(rawImage, 0, rawImage.length); - } - } mHandler.post(new Runnable() { @Override public void run() { diff --git a/src/org/linphone/EditContactFragment.java b/src/org/linphone/EditContactFragment.java index 4f46e980a..70a457e50 100644 --- a/src/org/linphone/EditContactFragment.java +++ b/src/org/linphone/EditContactFragment.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.List; import org.linphone.compatibility.Compatibility; -import org.linphone.mediastream.Log; import org.linphone.mediastream.Version; import org.linphone.ui.AvatarWithShadow; diff --git a/src/org/linphone/HistoryDetailFragment.java b/src/org/linphone/HistoryDetailFragment.java index 6efb6db65..e82c67093 100644 --- a/src/org/linphone/HistoryDetailFragment.java +++ b/src/org/linphone/HistoryDetailFragment.java @@ -23,6 +23,7 @@ import java.util.Calendar; import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneCoreException; import org.linphone.core.LinphoneCoreFactory; +import org.linphone.ui.AvatarWithShadow; import android.annotation.SuppressLint; import android.net.Uri; @@ -41,6 +42,7 @@ import android.widget.TextView; public class HistoryDetailFragment extends Fragment implements OnClickListener { private ImageView dialBack, chat, addToContacts; private View view; + private AvatarWithShadow contactPicture; private TextView contactName, contactAddress, callDirection, time, date; private String sipUri, displayName, pictureUri; @@ -67,6 +69,8 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener { addToContacts = (ImageView) view.findViewById(R.id.addToContacts); addToContacts.setOnClickListener(this); + contactPicture = (AvatarWithShadow) view.findViewById(R.id.contactPicture); + contactName = (TextView) view.findViewById(R.id.contactName); if (displayName == null && getResources().getBoolean(R.bool.only_display_username_if_unknown) && LinphoneUtils.isSipAddress(sipUri)) { displayName = LinphoneUtils.getUsernameFromAddress(sipUri); @@ -108,7 +112,9 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener { LinphoneAddress lAddress; try { lAddress = LinphoneCoreFactory.instance().createLinphoneAddress(sipUri); - LinphoneUtils.findUriPictureOfContactAndSetDisplayName(lAddress, view.getContext().getContentResolver()); + Uri pictureUri = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(lAddress, view.getContext().getContentResolver()); + if(pictureUri != null) + LinphoneUtils.setImagePictureFromUri(view.getContext(), contactPicture.getView(), Uri.parse(pictureUri.toString()), R.drawable.unknown_small); String displayName = lAddress.getDisplayName(); if (displayName != null) { view.findViewById(R.id.addContactRow).setVisibility(View.GONE); @@ -116,6 +122,7 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener { } catch (LinphoneCoreException e) { e.printStackTrace(); } + } public void changeDisplayedHistory(String sipUri, String displayName, String pictureUri, String status, String callTime, String callDate) {