From 645e9bf16a44d64ebf87c3f4c0584ed6c9cc00cb Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 10 Apr 2025 14:26:35 -0300
Subject: [PATCH] Allow back press to return from archive to converation list.

---
 .../ConversationListArchiveFragment.java                 | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java
index 09cf803662..14154173f1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java
@@ -20,6 +20,7 @@ import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.view.View;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -27,6 +28,7 @@ import androidx.annotation.StringRes;
 import androidx.annotation.WorkerThread;
 import androidx.appcompat.view.ActionMode;
 import androidx.compose.material3.SnackbarDuration;
+import androidx.navigation.fragment.NavHostFragment;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.signal.core.util.concurrent.LifecycleDisposable;
@@ -75,6 +77,13 @@ public class ConversationListArchiveFragment extends ConversationListFragment im
     foldersList = view.findViewById(R.id.chat_folder_list);
 
     foldersList.setVisibility(View.GONE);
+
+    requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), new OnBackPressedCallback(true) {
+      @Override
+      public void handleOnBackPressed() {
+        NavHostFragment.findNavController(ConversationListArchiveFragment.this).popBackStack();
+      }
+    });
   }
 
   @Override