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/EditAccountActivity.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/EditAccountActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index 714a5c60..0fbcfb90 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -27,6 +27,7 @@ import de.thedevstack.conversationsplus.ui.listeners.ShowResourcesListDialogList import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.services.AvatarService; import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate; import eu.siacs.conversations.ui.adapter.KnownHostsAdapter; import eu.siacs.conversations.utils.CryptoHelper; @@ -158,7 +159,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate && mAccount.getStatus() == Account.State.ONLINE) { if (!mFetchingAvatar) { mFetchingAvatar = true; - xmppConnectionService.checkForAvatar(mAccount, + AvatarService.getInstance().checkForAvatar(mAccount, mAvatarFetchCallback); } } else { @@ -428,7 +429,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate } if (this.jidToEdit != null) { this.mAvatar.setVisibility(View.VISIBLE); - this.mAvatar.setImageBitmap(avatarService().get(this.mAccount, getPixel(72))); + this.mAvatar.setImageBitmap(AvatarService.getInstance().get(this.mAccount, getPixel(72))); } if (this.mAccount.isOptionSet(Account.OPTION_REGISTER)) { this.mRegisterNew.setVisibility(View.VISIBLE); |