From 2e0985d740cab383fab47b2edc10c63e8bb660c6 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Tue, 19 Jan 2016 11:52:28 +0100 Subject: [PATCH] Fix avatar in notification and fix remove chatroom --- res/drawable-xhdpi/topbar_avatar.png | Bin 0 -> 3021 bytes src/org/linphone/ChatListFragment.java | 2 +- src/org/linphone/LinphoneService.java | 10 +++++----- 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 res/drawable-xhdpi/topbar_avatar.png diff --git a/res/drawable-xhdpi/topbar_avatar.png b/res/drawable-xhdpi/topbar_avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..56ae1b54a915ef3d326063658dba210a13601da1 GIT binary patch literal 3021 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 literal 0 HcmV?d00001 diff --git a/src/org/linphone/ChatListFragment.java b/src/org/linphone/ChatListFragment.java index 3580c2f70..cfc3ae262 100644 --- a/src/org/linphone/ChatListFragment.java +++ b/src/org/linphone/ChatListFragment.java @@ -533,7 +533,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte } }); if(chatList.isItemChecked(position)) { - enabledDeleteButton(true); + select.setChecked(true); } else { select.setChecked(false); } diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index 56a7f9b2c..03fed62ef 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -320,12 +320,12 @@ public final class LinphoneService extends Service { address.setDisplayName(displayName); Contact contact = ContactsManager.getInstance().findContactWithAddress(getContentResolver(), address); - Uri pictureUri = contact != null ? contact.getPhotoUri() : null; + Uri pictureUri = contact != null ? contact.getThumbnailUri() : null; Bitmap bm = null; try { bm = MediaStore.Images.Media.getBitmap(getContentResolver(), pictureUri); } catch (Exception e) { - bm = BitmapFactory.decodeResource(getResources(), R.drawable.avatar); + bm = BitmapFactory.decodeResource(getResources(), R.drawable.topbar_avatar); } String name = address.getDisplayName() == null ? address.getUserName() : address.getDisplayName(); mIncallNotif = Compatibility.createInCallNotification(getApplicationContext(), mNotificationTitle, getString(notificationTextId), inconId, bm, name, mNotifContentIntent); @@ -399,7 +399,7 @@ public final class LinphoneService extends Service { try { Contact contact = ContactsManager.getInstance().findContactWithAddress(getContentResolver(), LinphoneCoreFactory.instance().createLinphoneAddress(fromSipUri)); if (contact != null) - pictureUri = contact.getPhotoUri(); + pictureUri = contact.getThumbnailUri(); } catch (LinphoneCoreException e1) { Log.e("Cannot parse from address ", e1); } @@ -409,10 +409,10 @@ public final class LinphoneService extends Service { try { bm = MediaStore.Images.Media.getBitmap(getContentResolver(), pictureUri); } catch (Exception e) { - bm = BitmapFactory.decodeResource(getResources(), R.drawable.avatar); + bm = BitmapFactory.decodeResource(getResources(), R.drawable.topbar_avatar); } } else { - bm = BitmapFactory.decodeResource(getResources(), R.drawable.avatar); + bm = BitmapFactory.decodeResource(getResources(), R.drawable.topbar_avatar); } mMsgNotif = Compatibility.createMessageNotification(getApplicationContext(), mMsgNotifCount, fromName, message, bm, notifContentIntent);