From 7a592117db7c6acbfacee9cbf7333f56a695d397 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Thu, 12 Sep 2024 13:00:00 -0500 Subject: [PATCH] Fix NPE (cherry picked from commit 6b999dfe4f6bf5bc8a2ccbea79ab6af67501d868) --- .../java/eu/siacs/conversations/ui/ConversationsActivity.java | 2 +- 1 file changed, 1 insertion(+), 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 07238e929..8f138c00b 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java @@ -1161,7 +1161,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio savedInstanceState.putLong("mainFilter", mainFilter); savedInstanceState.putSerializable("selectedTag", selectedTag); savedInstanceState = binding.drawer.saveInstanceState(savedInstanceState); - savedInstanceState = accountHeader.saveInstanceState(savedInstanceState); + if (accountHeader != null) savedInstanceState = accountHeader.saveInstanceState(savedInstanceState); super.onSaveInstanceState(savedInstanceState); }