diff options
| -rw-r--r-- | app/build.gradle | 2 | ||||
| -rw-r--r-- | app/src/main/java/com/wireguard/android/activity/MainActivity.java | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/app/build.gradle b/app/build.gradle index abae4e08..995229d5 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 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() { |