From b999ccc83b42327e7010c2b399ee8e9bdd4507d7 Mon Sep 17 00:00:00 2001
From: DerEnderKeks <derenderkeks@gmail.com>
Date: Wed, 31 Mar 2021 17:06:39 +0200
Subject: [PATCH 1/2] Fixed that app vanished from recent apps list after
 locking

---
 .../main/java/com/beemdevelopment/aegis/ui/AegisActivity.java   | 2 +-
 1 file changed, 1 insertion(+), 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 312f18dc..ebdf38f0 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
@@ -89,7 +89,7 @@ public abstract class AegisActivity extends AppCompatActivity implements AegisAp
     @Override
     public void onLocked(boolean userInitiated) {
         setResult(RESULT_CANCELED, null);
-        finishAndRemoveTask();
+        finish();
     }
 
     protected AegisApplication getApp() {

From 5353e7c3b1f8256407fbddea6ea3a83322670ff3 Mon Sep 17 00:00:00 2001
From: DerEnderKeks <derenderkeks@gmail.com>
Date: Thu, 1 Apr 2021 18:03:16 +0200
Subject: [PATCH 2/2] Changed method to finish activities when locking

---
 .../com/beemdevelopment/aegis/ui/AegisActivity.java  | 12 +++++++++++-
 1 file changed, 11 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 ebdf38f0..341c78d7 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
@@ -1,5 +1,6 @@
 package com.beemdevelopment.aegis.ui;
 
+import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -19,6 +20,8 @@ import com.beemdevelopment.aegis.ThemeMap;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.vault.VaultManagerException;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Locale;
 import java.util.Map;
 
@@ -89,7 +92,14 @@ public abstract class AegisActivity extends AppCompatActivity implements AegisAp
     @Override
     public void onLocked(boolean userInitiated) {
         setResult(RESULT_CANCELED, null);
-        finish();
+        try {
+            Method method = Activity.class.getDeclaredMethod("finish", int.class);
+            method.setAccessible(true);
+            method.invoke(this, 2); // FINISH_TASK_WITH_ACTIVITY = 2
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+            finishAndRemoveTask();
+        }
     }
 
     protected AegisApplication getApp() {