From 5ae6a0b2873bee4a17e0ef3ec9b56f48827a6383 Mon Sep 17 00:00:00 2001 From: tarsin Date: Mon, 9 Jan 2023 19:00:04 +0800 Subject: [PATCH] Fixup migrate to androidx navigation --- app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt index dbd5bcdb6..58be42b8f 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt @@ -232,8 +232,12 @@ class MainActivity : EhActivity() { } binding.navView.setupWithNavController(navController) - binding.drawView.addDrawerListener(mDrawerOnBackPressedCallback) - onBackPressedDispatcher.addCallback(mDrawerOnBackPressedCallback) + lifecycleScope.launchUI { + delay(100) + // delay 100ms to make sure it take precedence over androidx navigation's callback + binding.drawView.addDrawerListener(mDrawerOnBackPressedCallback) + onBackPressedDispatcher.addCallback(mDrawerOnBackPressedCallback) + } if (savedInstanceState == null) { if (intent.action != Intent.ACTION_MAIN) { onNewIntent(intent)