From 59620456ee0bf52e831ccbe3e0242253ab504c8b Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 12 Oct 2019 21:43:26 +0200 Subject: Revert "Fix activity leak on Android Q" This reverts commit 489518000971914b2608da43e2146690dcc02cb9. October has arrived. Signed-off-by: Jason A. Donenfeld --- .../java/com/wireguard/android/activity/MainActivity.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'app/src/main/java') diff --git a/app/src/main/java/com/wireguard/android/activity/MainActivity.java b/app/src/main/java/com/wireguard/android/activity/MainActivity.java index 0a1dc0be..ab9a4f8a 100644 --- a/app/src/main/java/com/wireguard/android/activity/MainActivity.java +++ b/app/src/main/java/com/wireguard/android/activity/MainActivity.java @@ -53,16 +53,7 @@ public class MainActivity extends BaseActivity setSelectedTunnel(null); return; } - if (isTaskRoot()) { - // @{link TunnelDetailFragment} is in foreground - if (backStackEntries == 2) { - getSupportFragmentManager().popBackStack(); - } else if (backStackEntries == 0) { - finishAfterTransition(); - } - } else { - super.onBackPressed(); - } + super.onBackPressed(); } @Override public void onBackStackChanged() { -- cgit v1.2.3