From c13b271b0bfba4aeb9e48630e98c01c7ec077a0e Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Mon, 18 Aug 2025 10:25:15 +0000
Subject: [PATCH] Fix TrashActivity closing unexpectedly

This commit fixes an issue where the TrashActivity would close unexpectedly if the vault was not loaded. It adds logic to check if the vault is loaded and to start the AuthActivity if it's not.
---
 .../aegis/ui/TrashActivity.java               | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/TrashActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/TrashActivity.java
index 734528b4..68083b9e 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/TrashActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/TrashActivity.java
@@ -15,6 +15,15 @@ public class TrashActivity extends AegisActivity implements TrashEntryAdapter.Tr
     private RecyclerView recyclerView;
     private TrashEntryAdapter adapter;
 
+    private final androidx.activity.result.ActivityResultLauncher<Intent> authResultLauncher =
+            registerForActivityResult(new androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult(), activityResult -> {
+                if (activityResult.getResultCode() == RESULT_OK) {
+                    loadDeletedEntries();
+                } else {
+                    finish();
+                }
+            });
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -25,8 +34,18 @@ public class TrashActivity extends AegisActivity implements TrashEntryAdapter.Tr
 
         recyclerView = findViewById(R.id.trash_recycler_view);
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
 
-        loadDeletedEntries();
+        if (!_vaultManager.isVaultLoaded()) {
+            Intent intent = new Intent(this, AuthActivity.class);
+            authResultLauncher.launch(intent);
+        } else {
+            loadDeletedEntries();
+        }
     }
 
     private void loadDeletedEntries() {