Skip to content

fix(android): crash on changing activity context after animated navigation Fixes #5674 #5700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manoldonev merged 3 commits into from
Apr 20, 2018
Merged

fix(android): crash on changing activity context after animated navigation Fixes #5674 #5700

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8799c28
fix(android): lollipop crash on changing activity context after navig…
manoldonev Apr 18, 2018
3d1a199
Merge branch 'master' into mdonev/lollipop-fragment-transition-fix
manoldonev Apr 19, 2018
53182ea
Merge branch 'master' into mdonev/lollipop-fragment-transition-fix
manoldonev Apr 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions tns-core-modules/ui/frame/frame.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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;
Expand Down Expand Up @@ -186,13 +191,28 @@ export class Frame extends FrameBase {
super.onUnloaded();
}

private disposeCurrentFragment(){
if (this._currentEntry && this._currentEntry.fragment) {
const manager: android.app.FragmentManager = this._getFragmentManager();
const transaction = manager.beginTransaction();
private disposeCurrentFragment(): void {
Copy link
Contributor Author

@manoldonev manoldonev Apr 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need the disposeCurrentFragment() call because of this: [quoting @MartoYankov] in Tabs-Frames-Pages scenario all of the frames' fragments are restored before the tabs' fragments are recreated and they try to load their pages before they have been selected. The chosen solution was to remove the frame fragment on unloading the frame. We want Android to recreate the tab fragment that will load its frame (that creates a new fragment for the page).

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 {
Expand Down