From cda3df9025985a65b93917962a29e4b0aa7f6faa 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 12:26:27 +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 overrides the onLocked method in TrashActivity to prevent it from being finished when the vault is locked.
---
 .../java/com/beemdevelopment/aegis/ui/AegisActivity.java    | 1 -
 .../java/com/beemdevelopment/aegis/ui/TrashActivity.java    | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
index 5c73ff88..5a467fbc 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
@@ -244,7 +244,6 @@ public abstract class AegisActivity extends AppCompatActivity implements VaultMa
         return !(this instanceof MainActivity)
                 && !(this instanceof AuthActivity)
                 && !(this instanceof IntroActivity)
-                && !(this instanceof TrashActivity)
                 && !_vaultManager.isVaultLoaded();
     }
 
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 2772898a..1edd443f 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/TrashActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/TrashActivity.java
@@ -70,4 +70,10 @@ public class TrashActivity extends AegisActivity implements TrashEntryAdapter.Tr
             adapter.removeItem(entry);
         });
     }
+
+    @Override
+    public void onLocked(boolean userInitiated) {
+        // Do nothing. This will prevent the activity from being finished when the vault is locked.
+        // The onStart() method will handle the case where the vault is not loaded.
+    }
 }