diff options
| author | kruks23 <scardenas@openmailbox.org> | 2014-07-10 15:13:31 +0200 |
|---|---|---|
| committer | kruks23 <scardenas@openmailbox.org> | 2014-07-10 15:13:31 +0200 |
| commit | 8379f695166ee9888e6e1221894c7d1494669a6d (patch) | |
| tree | b43c4b4fe72916df1dd547ab706ffae34cdcd243 /src/eu/siacs/conversations/utils | |
| parent | c7088489bd339e4b8b5128e909a1b4377864a5c9 (diff) | |
| parent | e97b5244552c8da06b3311bccb831be30c9a641a (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs/conversations/utils')
| -rw-r--r-- | src/eu/siacs/conversations/utils/UIHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java index eeefa591e..9fd16c430 100644 --- a/src/eu/siacs/conversations/utils/UIHelper.java +++ b/src/eu/siacs/conversations/utils/UIHelper.java @@ -13,11 +13,11 @@ import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Contact; import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.ListItem; import eu.siacs.conversations.entities.Message; import eu.siacs.conversations.entities.MucOptions.User; import eu.siacs.conversations.ui.ConversationActivity; import eu.siacs.conversations.ui.ManageAccountActivity; - import android.app.Activity; import android.app.AlertDialog; import android.app.Notification; @@ -239,7 +239,7 @@ public class UIHelper { } } - public static Bitmap getContactPicture(Contact contact, int dpSize, + public static Bitmap getContactPicture(ListItem contact, int dpSize, Context context, boolean notification) { String uri = contact.getProfilePhoto(); if (uri == null) { |