Преглед изворни кода

Revert "Fix activity leak on Android Q"

This reverts commit 4895180009.

October has arrived.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
master
Jason A. Donenfeld пре 5 година
родитељ
комит
59620456ee
2 измењених фајлова са 1 додато и 12 уклоњено
  1. +0
    -2
      app/build.gradle
  2. +1
    -10
      app/src/main/java/com/wireguard/android/activity/MainActivity.java

+ 0
- 2
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) {


+ 1
- 10
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() {


Loading…
Откажи
Сачувај