diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-01-13 16:49:06 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-01-13 16:49:06 +0100 |
| commit | 7e44ff92d7d9094207d0a0b1639a88c5fd6e8ccc (patch) | |
| tree | b6a0ffea7a3b7cf798c3ec8002e9652ba4908232 /src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java | |
| parent | 06398afd4002cf506e74cb471a2f7dd89f3810f7 (diff) | |
| parent | 8644c4676a5fda9d642244ff70e72c5fe524a24d (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java index 7835f940..d95abc8e 100644 --- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java @@ -17,6 +17,7 @@ import de.thedevstack.conversationsplus.utils.ImageUtil; import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.services.AvatarService; import eu.siacs.conversations.utils.PhoneHelper; import eu.siacs.conversations.xmpp.jid.InvalidJidException; import eu.siacs.conversations.xmpp.jid.Jid; @@ -172,7 +173,7 @@ public class PublishProfilePictureActivity extends XmppActivity { if (this.avatarUri == null) { if (this.account.getAvatar() != null || this.defaultUri == null) { - this.avatar.setImageBitmap(avatarService().get(account, + this.avatar.setImageBitmap(AvatarService.getInstance().get(account, getPixel(194))); if (this.defaultUri != null) { this.avatar |