aboutsummaryrefslogtreecommitdiffstats
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-12 21:44:04 +0200
commitd5bff3dae84e8a92326c94f62e8e4834b415bba6 (patch)
tree1b0b01515085d9613f5920b558924c5d39b4b670
parentVersion bump (diff)
downloadwireguard-android-d5bff3dae84e8a92326c94f62e8e4834b415bba6.tar.xz
wireguard-android-d5bff3dae84e8a92326c94f62e8e4834b415bba6.zip
Revert "Fix activity leak on Android Q"
This reverts commit 489518000971914b2608da43e2146690dcc02cb9. October has arrived.
-rw-r--r--app/build.gradle2
-rw-r--r--app/src/main/java/com/wireguard/android/activity/MainActivity.java11
2 files changed, 1 insertions, 12 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 9a90a3e..afda8d7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -71,7 +71,6 @@ ext {
appcompatVersion = '1.1.0'
cardviewVersion = '1.0.0'
databindingVersion = '3.5.0'
- leakCanaryVersion = "2.0-beta-3"
materialComponentsVersion = '1.0.0'
jsr305Version = '3.0.2'
preferenceVersion = '1.1.0'
@@ -95,7 +94,6 @@ dependencies {
implementation "com.journeyapps:zxing-android-embedded:$zxingEmbeddedVersion"
implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion"
implementation "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion"
- debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"
}
tasks.withType(JavaCompile) {
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 0a1dc0b..ab9a4f8 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() {