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

fix(android): lollipop crash on changing activity context after navigation w/transition (#5700)

Browse Source
This commit is contained in:
Manol Donev
2018-04-20 13:46:03 +03:00
committed by GitHub
parent 1536d15ecf
commit 4f5887b0ad
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tns-core-modules/ui/frame/frame.android.ts
View File

@ -22,6 +22,9 @@ import { profile } from "../../profiling";
// TODO: Remove this and get it from global to decouple builder for angular
import { createViewFromEntry } from "../builder";
import { device } from "../../platform";
import lazy from "../../utils/lazy";
export * from "./frame-common";
const INTENT_EXTRA = "com.tns.activity";
@ -32,6 +35,8 @@ const CALLBACKS = "_callbacks";
const ownerSymbol = Symbol("_owner");
const activityRootViewsMap = new Map<number, WeakRef<View>>();
const sdkVersion = lazy(() => parseInt(device.sdkVersion));
let navDepth = -1;
let fragmentId = -1;
export let moduleLoaded: boolean;
@ -186,13 +191,28 @@ export class Frame extends FrameBase {
super.onUnloaded();
}
private disposeCurrentFragment(){
if (this._currentEntry && this._currentEntry.fragment) {
private disposeCurrentFragment(): void {
if (!this._currentEntry || !this._currentEntry.fragment) {
return;
}
const manager: android.app.FragmentManager = this._getFragmentManager();
const transaction = manager.beginTransaction();
const androidSdkVersion = sdkVersion();
if (androidSdkVersion !== 21 && androidSdkVersion !== 22) {
transaction.remove(this._currentEntry.fragment);
transaction.commitAllowingStateLoss();
} else {
// https://github.com/NativeScript/NativeScript/issues/5674
// HACK: Add and remove dummy fragment to workaround a Lollipop issue
// with inFragment passed as null when adding transition targets: https://android.googlesource.com/platform/frameworks/base.git/+/lollipop-release/core/java/android/app/BackStackRecord.java#1127
const dummyFragmentTag = "dummy";
const dummyFragment = this.createFragment(<BackstackEntry>{}, dummyFragmentTag);
transaction.replace(this.containerViewId, dummyFragment, dummyFragmentTag);
transaction.remove(dummyFragment);
}
transaction.commitAllowingStateLoss();
}
private createFragment(backstackEntry: BackstackEntry, fragmentTag: string): android.app.Fragment {