From dd4384767c8e1cd23ae0771808d5eb1d052917e5 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com> Date: Mon, 24 May 2021 20:09:35 +0700 Subject: [PATCH] Fix incognito mode disabled after the app kicked out of memory (#5167) The application class onCreate will also be called when user navigates to an activity after the app process is killed by the system. So make sure the incognito is disabled only when the entry point of the app is created from scratch (e.g. after being force closed by the user). (cherry picked from commit 3c186a3c8d3fd74f489a7aa2a27906d29502e0f6) --- app/src/main/java/eu/kanade/tachiyomi/App.kt | 3 --- app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt index f612aee76..76c443708 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt @@ -104,9 +104,6 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory { ProcessLifecycleOwner.get().lifecycle.addObserver(this) - // Reset Incognito Mode on relaunch - preferences.incognitoMode().set(false) - // Show notification to disable Incognito Mode when it's enabled preferences.incognitoMode().asFlow() .onEach { enabled -> diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index b383b6968..dbca7d05e 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -249,6 +249,9 @@ class MainActivity : BaseViewBindingActivity() { syncActivityViewWithController(router.backstack.lastOrNull()?.controller()) if (savedInstanceState == null) { + // Reset Incognito Mode on relaunch + preferences.incognitoMode().set(false) + // Show changelog prompt on update // TODO // if (Migrations.upgrade(preferences) && !BuildConfig.DEBUG) {