Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix activity leak on Android Q"

Browse Source 
This reverts commit 489518000971914b2608da43e2146690dcc02cb9.

October has arrived.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2019-10-12 21:43:26 +02:00
parent e42bd29382
commit 59620456ee
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -71,7 +71,6 @@ ext {
appcompatVersion = '1.1.0' appcompatVersion = '1.1.0'
cardviewVersion = '1.0.0' cardviewVersion = '1.0.0'
databindingVersion = '3.5.0' databindingVersion = '3.5.0'
leakCanaryVersion = "2.0-beta-3"
materialComponentsVersion = '1.0.0' materialComponentsVersion = '1.0.0'
jsr305Version = '3.0.2' jsr305Version = '3.0.2'
preferenceVersion = '1.1.0' preferenceVersion = '1.1.0'
@ -95,7 +94,6 @@ dependencies {
implementation "com.journeyapps:zxing-android-embedded:$zxingEmbeddedVersion" implementation "com.journeyapps:zxing-android-embedded:$zxingEmbeddedVersion"
implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion" implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion"
implementation "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion" implementation "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion"
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {

11
app/src/main/java/com/wireguard/android/activity/MainActivity.java
View File

@ -53,16 +53,7 @@ public class MainActivity extends BaseActivity
setSelectedTunnel(null); setSelectedTunnel(null);
return; return;
} }
if (isTaskRoot()) { super.onBackPressed();
// @{link TunnelDetailFragment} is in foreground
if (backStackEntries == 2) {
getSupportFragmentManager().popBackStack();
} else if (backStackEntries == 0) {
finishAfterTransition();
}
} else {
super.onBackPressed();
}
} }
@Override public void onBackStackChanged() { @Override public void onBackStackChanged() {