From 1b059156f9addd0c92d4c8cec6ab6ea99ae91173 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Wed, 4 Jun 2025 11:54:56 -0500 Subject: [PATCH] Don't override back button --- .../conversations/ui/ConversationsActivity.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java index 51a4439b1fc72c9f6714e3255df29ca39826c7a2..325da2aece6a695f3bb34eb10253f146cb066501 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java @@ -192,6 +192,7 @@ public class ConversationsActivity extends XmppActivity private HashSet selectedTag = new HashSet<>(); private long mainFilter = DRAWER_ALL_CHATS; private boolean refreshAccounts = true; + private boolean invisibles = false; private static boolean isViewOrShareIntent(Intent i) { Log.d(Config.LOGTAG, "action: " + (i == null ? null : i.getAction())); @@ -237,7 +238,8 @@ public class ConversationsActivity extends XmppActivity false ); - final var invisibles = removedConversations.stream().anyMatch(c -> c.unreadCount(xmppConnectionService) > 0); + invisibles = removedConversations.stream().anyMatch(c -> c.unreadCount(xmppConnectionService) > 0); + invalidateActionBarTitle(); // Reconstruct the complete list for counts and tags computation conversations.addAll(removedConversations); @@ -274,14 +276,6 @@ public class ConversationsActivity extends XmppActivity } } - ActionBar supportBar = getSupportActionBar(); - - if (invisibles && supportBar != null) { - supportBar.setHomeAsUpIndicator(R.drawable.menu_with_dot_24dp); - } else if (supportBar != null) { - supportBar.setHomeAsUpIndicator(R.drawable.menu_24dp); - } - com.mikepenz.materialdrawer.util.MaterialDrawerSliderViewExtensionsKt.updateBadge( binding.drawer, DRAWER_UNREAD_CHATS, @@ -1464,7 +1458,7 @@ public class ConversationsActivity extends XmppActivity actionBar.setTitle(R.string.app_name); } actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setHomeAsUpIndicator(R.drawable.menu_24dp); + actionBar.setHomeAsUpIndicator(invisibles ? R.drawable.menu_with_dot_24dp : R.drawable.menu_24dp); ToolbarUtils.resetActionBarOnClickListeners(binding.toolbar); ToolbarUtils.setActionBarOnClickListener( binding.toolbar,