From 81c0944245b84824f1ba76ce225225ea996f57c1 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Thu, 20 Jun 2019 22:30:21 +0200 Subject: show own account in chatlist/contacts/conferences if you are in multi account mode --- src/main/java/de/pixart/messenger/utils/UIHelper.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/main/java/de/pixart/messenger/utils/UIHelper.java') diff --git a/src/main/java/de/pixart/messenger/utils/UIHelper.java b/src/main/java/de/pixart/messenger/utils/UIHelper.java index a2a536cea..b2e73fb46 100644 --- a/src/main/java/de/pixart/messenger/utils/UIHelper.java +++ b/src/main/java/de/pixart/messenger/utils/UIHelper.java @@ -18,6 +18,7 @@ import java.util.Locale; import de.pixart.messenger.Config; import de.pixart.messenger.R; import de.pixart.messenger.crypto.axolotl.AxolotlService; +import de.pixart.messenger.entities.Account; import de.pixart.messenger.entities.Contact; import de.pixart.messenger.entities.Conversation; import de.pixart.messenger.entities.Conversational; @@ -553,20 +554,20 @@ public class UIHelper { return LOCATION_QUESTIONS.contains(body); } - public static ListItem.Tag getTagForStatus(Context context, Presence.Status status) { + public static ListItem.Tag getTagForStatus(Context context, Presence.Status status, Account account) { switch (status) { case CHAT: - return new ListItem.Tag(context.getString(R.string.presence_chat), 0xff259b24, 0); + return new ListItem.Tag(context.getString(R.string.presence_chat), 0xff259b24, 0, account); case AWAY: - return new ListItem.Tag(context.getString(R.string.presence_away), 0xffff9800, 0); + return new ListItem.Tag(context.getString(R.string.presence_away), 0xffff9800, 0, account); case XA: - return new ListItem.Tag(context.getString(R.string.presence_xa), 0xfff44336, 0); + return new ListItem.Tag(context.getString(R.string.presence_xa), 0xfff44336, 0, account); case DND: - return new ListItem.Tag(context.getString(R.string.presence_dnd), 0xfff44336, 0); + return new ListItem.Tag(context.getString(R.string.presence_dnd), 0xfff44336, 0, account); case OFFLINE: - return new ListItem.Tag(context.getString(R.string.presence_offline), 0xff808080, 1); + return new ListItem.Tag(context.getString(R.string.presence_offline), 0xff808080, 1, account); default: - return new ListItem.Tag(context.getString(R.string.presence_online), 0xff259b24, 0); + return new ListItem.Tag(context.getString(R.string.presence_online), 0xff259b24, 0, account); } } -- cgit v1.2.3