From 37c6cbfe6d40b26eb5fe8757adea8c57e0c92b60 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Tue, 1 Oct 2024 12:40:10 -0500 Subject: [PATCH] Be careful not to reuse ids --- .../java/eu/siacs/conversations/ui/ConversationsActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java index 8b2e853dee1a0335eceb72a55120a6fe200fcbe9..9a5249459b0d4276d8716eb2091f511b69c5013b 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java @@ -298,8 +298,11 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio refreshAccounts = false; final var accounts = xmppConnectionService.getAccounts(); final var inHeader = new HashMap(); + long id = 101; for (final var p : ImmutableList.copyOf(accountHeader.getProfiles())) { if (p instanceof com.mikepenz.materialdrawer.model.ProfileSettingDrawerItem) continue; + final var pId = p.getIdentifier(); + if (id < pId) id = pId; if (accounts.contains(p.getTag()) || (accounts.size() > 1 && p.getTag() == null)) { inHeader.put((Account) p.getTag(), (com.mikepenz.materialdrawer.model.ProfileDrawerItem) p); } else { @@ -325,7 +328,6 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio accountHeader.addProfile(phoneAccounts, accountHeader.getProfiles().size() - 1); } - long id = 101; final boolean nightMode = Activities.isNightMode(this); for (final var a : accounts) { final var size = (int) getResources().getDimension(R.dimen.avatar_on_drawer);