javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3097 from NativeScript/nnikolov/ForeActivityFix

Browse Source 
Foreground activity cleared on activity destroyed.
This commit is contained in:
Nedyalko Nikolov
2016-11-15 14:13:13 +02:00
committed by GitHub
parent 76dd2b356e 3c9a2c7fa6
commit c5f3fd511a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tns-core-modules/application/application.android.ts
View File

@ -33,6 +33,10 @@ function initLifecycleCallbacks() {
}, },
onActivityDestroyed: function (activity: any) { onActivityDestroyed: function (activity: any) {
if (activity === androidApp.foregroundActivity) {
androidApp.foregroundActivity = undefined;
}
if (activity === androidApp.startActivity) { if (activity === androidApp.startActivity) {
androidApp.startActivity = undefined; androidApp.startActivity = undefined;
} }
@ -47,10 +51,6 @@ function initLifecycleCallbacks() {
}, },
onActivityPaused: function (activity: any) { onActivityPaused: function (activity: any) {
if (activity === androidApp.foregroundActivity) {
androidApp.foregroundActivity = undefined;
}
if (activity.isNativeScriptActivity) { if (activity.isNativeScriptActivity) {
androidApp.paused = true; androidApp.paused = true;