aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-01-13 16:49:06 +0100
committersteckbrief <steckbrief@chefmail.de>2016-01-13 16:49:06 +0100
commit7e44ff92d7d9094207d0a0b1639a88c5fd6e8ccc (patch)
treeb6a0ffea7a3b7cf798c3ec8002e9652ba4908232 /src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
parent06398afd4002cf506e74cb471a2f7dd89f3810f7 (diff)
parent8644c4676a5fda9d642244ff70e72c5fe524a24d (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
index 782a1231..1ca868b8 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
@@ -4,8 +4,10 @@ import java.util.List;
import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.services.AvatarService;
import eu.siacs.conversations.ui.XmppActivity;
import eu.siacs.conversations.ui.ManageAccountActivity;
+
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
@@ -37,7 +39,7 @@ public class AccountAdapter extends ArrayAdapter<Account> {
jid.setText(account.getJid().toBareJid().toString());
TextView statusView = (TextView) view.findViewById(R.id.account_status);
ImageView imageView = (ImageView) view.findViewById(R.id.account_image);
- imageView.setImageBitmap(activity.avatarService().get(account, activity.getPixel(48)));
+ imageView.setImageBitmap(AvatarService.getInstance().get(account, activity.getPixel(48)));
statusView.setText(getContext().getString(account.getStatus().getReadableId()));
switch (account.getStatus()) {
case ONLINE: