aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app/src/main
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-10-12 21:43:26 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-10-13 14:10:11 +0200
commit59620456ee0bf52e831ccbe3e0242253ab504c8b (patch)
treeaaf460dc09d244d4f9a42c086fa5431380f8c0a7 /app/src/main
parentVersion bump (diff)
downloadwireguard-android-59620456ee0bf52e831ccbe3e0242253ab504c8b.tar.xz
wireguard-android-59620456ee0bf52e831ccbe3e0242253ab504c8b.zip
Revert "Fix activity leak on Android Q"
This reverts commit 489518000971914b2608da43e2146690dcc02cb9. October has arrived. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/com/wireguard/android/activity/MainActivity.java11
1 files changed, 1 insertions, 10 deletions
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() {