From 9adb411b162cb61af6010db5a20ff6f5fe1e7534 Mon Sep 17 00:00:00 2001 From: Martin Guillon Date: Thu, 20 Jan 2022 21:35:49 +0100 Subject: [PATCH] fix(core): android fix for `foregroundActivity` not set on first `onNavigatingTo` --- packages/core/application/index.android.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/core/application/index.android.ts b/packages/core/application/index.android.ts index 7aeb305f6..0fc7bd6b4 100644 --- a/packages/core/application/index.android.ts +++ b/packages/core/application/index.android.ts @@ -336,6 +336,9 @@ function initLifecycleCallbacks() { const lifecycleCallbacks = new android.app.Application.ActivityLifecycleCallbacks({ onActivityCreated: profile('onActivityCreated', function (activity: androidx.appcompat.app.AppCompatActivity, savedInstanceState: android.os.Bundle) { + if (!androidApp.foregroundActivity) { + androidApp.foregroundActivity = activity; + } setThemeOnLaunch(activity, undefined, undefined); if (!androidApp.startActivity) {