diff options
| author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-03-21 22:16:39 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-03-21 22:16:39 +0100 |
| commit | df9db8c8b61ae090309933a8dff395e690ff9ba3 (patch) | |
| tree | c58a2630c4543fca8aeb191acbfc33c9a999e89f /src/eu/siacs/conversations/utils/UIHelper.java | |
| parent | f1c8b0e1b8bb16cceb32b12403166775b639f53a (diff) | |
| parent | a9e34d34926d7df3fb01143d6733b481c31c292d (diff) | |
Merge branch 'development'
Diffstat (limited to 'src/eu/siacs/conversations/utils/UIHelper.java')
| -rw-r--r-- | src/eu/siacs/conversations/utils/UIHelper.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java index 5d879714e..96d628fa5 100644 --- a/src/eu/siacs/conversations/utils/UIHelper.java +++ b/src/eu/siacs/conversations/utils/UIHelper.java @@ -305,15 +305,19 @@ public class UIHelper { } public static Bitmap getSelfContactPicture(Account account, int size, boolean showPhoneSelfContactPicture, Activity activity) { - Uri selfiUri = PhoneHelper.getSefliUri(activity); - if (selfiUri != null) { - try { - return BitmapFactory.decodeStream(activity - .getContentResolver().openInputStream(selfiUri)); - } catch (FileNotFoundException e) { - return getUnknownContactPicture(account.getJid(), size); + if (showPhoneSelfContactPicture) { + Uri selfiUri = PhoneHelper.getSefliUri(activity); + if (selfiUri != null) { + try { + return BitmapFactory.decodeStream(activity + .getContentResolver().openInputStream(selfiUri)); + } catch (FileNotFoundException e) { + return getUnknownContactPicture(account.getJid(), size); + } } + return getUnknownContactPicture(account.getJid(), size); + } else { + return getUnknownContactPicture(account.getJid(), size); } - return getUnknownContactPicture(account.getJid(), size); } } |