FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix for frequent crashes in Frame package by DickSmith · Pull Request #5063 · NativeScript/NativeScript · GitHub

/ NativeScript Public

Fix for frequent crashes in Frame package #5063

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

Closed
DickSmith wants to merge 11 commits into from
Conversation 7 Commits 11 Checks 0 Files changed
Closed

Fix for frequent crashes in Frame package #5063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7229c75
Fix for #4986
Nov 12, 2017
452e452
After fixing the previous locally and repacking and releasing a new v…
Nov 13, 2017
79f0f55
Formatting
Nov 13, 2017
389e4f2
Fixes for a low incidence but still possible crash on these:
Nov 19, 2017
9fa0813
Fix for:
Nov 30, 2017
4c98d8e
Further safety checks based on previous fixes for Android as well as …
Dec 4, 2017
c40b724
Merge branch 'master' of github.com:NativeScript/NativeScript
Dec 4, 2017
f2d1d4f
If callback is missing, still handleNotification (layout updated) #5071
Dec 5, 2017
2d50158
Crashed: com.apple.main-thread
Dec 8, 2017
c6ef60e
Revert "Crashed: com.apple.main-thread"
Dec 8, 2017
88c94ce
Try Catching these
Dec 11, 2017
File filter

Filter by extension

Filter by extension .ts  (5) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
6 changes: 5 additions & 1 deletion tns-core-modules/timer/timer.ios.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ class TimerTargetImpl extends NSObject {

public tick(timer): void {
if (!this.disposed) {
this.callback();
try {
this.callback();
} catch (e) {
// TODO
}
}

if (!this.shouldRepeat) {
Expand Down
58 changes: 32 additions & 26 deletions tns-core-modules/ui/frame/frame-common.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export function reloadPage(): void {
create: currentEntry.create,
moduleName: currentEntry.moduleName,
backstackVisible: currentEntry.backstackVisible
}
};

frame.navigate(newEntry);
}
Expand All @@ -72,7 +72,7 @@ const moduleCreatePage = profile("module.createPage", (moduleNamePath: string, m
if (traceEnabled()) {
traceWrite("Calling createPage()", traceCategories.Navigation);
}
var page = moduleExports.createPage();
const page = moduleExports.createPage();

let cssFileName = resolveFileName(moduleNamePath, "css");
// If there is no cssFile only appCss will be applied at loaded.
Expand Down Expand Up @@ -204,7 +204,7 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {
const navigationContext: NavigationContext = {
entry: backstackEntry,
isBackNavigation: true
}
};

this._navigationQueue.push(navigationContext);

Expand Down Expand Up @@ -273,7 +273,7 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {
const navigationContext: NavigationContext = {
entry: backstackEntry,
isBackNavigation: false
}
};

this._navigationQueue.push(navigationContext);

Expand Down Expand Up @@ -367,34 +367,38 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {

@profile
private performNavigation(navigationContext: NavigationContext) {
let navContext = navigationContext.entry;
if (navigationContext) {
let navContext = navigationContext.entry;

// TODO: This should happen once navigation is completed.
if (navContext && navContext.entry && navContext.entry.clearHistory) {
// Don't clear backstack immediately or we can't remove pages from frame.
} else if (FrameBase._isEntryBackstackVisible(this._currentEntry)) {
this._backStack.push(this._currentEntry);
}

// TODO: This should happen once navigation is completed.
if (navigationContext.entry.entry.clearHistory) {
// Don't clear backstack immediately or we can't remove pages from frame.
} else if (FrameBase._isEntryBackstackVisible(this._currentEntry)) {
this._backStack.push(this._currentEntry);
this._onNavigatingTo(navContext, navigationContext.isBackNavigation);
this._navigateCore(navContext);
}

this._onNavigatingTo(navContext, navigationContext.isBackNavigation);
this._navigateCore(navContext);
}

@profile
private performGoBack(navigationContext: NavigationContext) {
let backstackEntry = navigationContext.entry;
if (!backstackEntry) {
backstackEntry = this._backStack.pop();
navigationContext.entry = backstackEntry;
} else {
const index = this._backStack.indexOf(backstackEntry);
const removed = this._backStack.splice(index + 1);
this._backStack.pop();
this._removeBackstackEntries(removed);
if (navigationContext) {
let backstackEntry = navigationContext.entry;
if (!backstackEntry) {
backstackEntry = this._backStack.pop();
navigationContext.entry = backstackEntry;
} else {
const index = this._backStack.indexOf(backstackEntry);
const removed = this._backStack.splice(index + 1);
this._backStack.pop();
this._removeBackstackEntries(removed);
}

this._onNavigatingTo(backstackEntry, true);
this._goBackCore(backstackEntry);
}

this._onNavigatingTo(backstackEntry, true);
this._goBackCore(backstackEntry);
}

public _goBackCore(backstackEntry: BackstackEntry) {
Expand All @@ -414,7 +418,9 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {
this.currentPage.onNavigatingFrom(isBack);
}

backstackEntry.resolvedPage.onNavigatingTo(backstackEntry.entry.context, isBack, backstackEntry.entry.bindingContext);
if (backstackEntry && backstackEntry.resolvedPage) {
backstackEntry.resolvedPage.onNavigatingTo(backstackEntry.entry.context, isBack, backstackEntry.entry.bindingContext);
}
}

public get animated(): boolean {
Expand Down
45 changes: 25 additions & 20 deletions tns-core-modules/ui/frame/frame.android.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -168,34 +168,39 @@ export class Frame extends FrameBase {
}

transaction.replace(this.containerViewId, newFragment, newFragmentTag);
transaction.commit();
transaction.commitAllowingStateLoss();
}

public _goBackCore(backstackEntry: BackstackEntry) {
super._goBackCore(backstackEntry);
navDepth = backstackEntry.navDepth;

const activity = this._android.activity;
const manager = activity.getFragmentManager();
const transaction = manager.beginTransaction();
if (backstackEntry) {
navDepth = backstackEntry.navDepth;

if (!backstackEntry.fragment) {
// Happens on newer API levels. On older all fragments
// are recreated once activity is created.
// This entry fragment was destroyed by app suspend.
// We need to recreate its animations and then reverse it.
backstackEntry.fragment = this.createFragment(backstackEntry, backstackEntry.fragmentTag);
_updateTransitions(backstackEntry);
}
const activity = this._android.activity;
if (activity) {
const manager = activity.getFragmentManager();
const transaction = manager.beginTransaction();

if (!backstackEntry.fragment) {
// Happens on newer API levels. On older all fragments
// are recreated once activity is created.
// This entry fragment was destroyed by app suspend.
// We need to recreate its animations and then reverse it.
backstackEntry.fragment = this.createFragment(backstackEntry, backstackEntry.fragmentTag);
_updateTransitions(backstackEntry);
}

const transitionReversed = _reverseTransitions(backstackEntry, this._currentEntry);
if (!transitionReversed) {
// If transition were not reversed then use animations.
transaction.setCustomAnimations(AnimationType.popEnterFakeResourceId, AnimationType.popExitFakeResourceId, AnimationType.enterFakeResourceId, AnimationType.exitFakeResourceId);
}
const transitionReversed = _reverseTransitions(backstackEntry, this._currentEntry);
if (!transitionReversed) {
// If transition were not reversed then use animations.
transaction.setCustomAnimations(AnimationType.popEnterFakeResourceId, AnimationType.popExitFakeResourceId, AnimationType.enterFakeResourceId, AnimationType.exitFakeResourceId);
}

transaction.replace(this.containerViewId, backstackEntry.fragment, backstackEntry.fragmentTag);
transaction.commit();
transaction.replace(this.containerViewId, backstackEntry.fragment, backstackEntry.fragmentTag);
transaction.commitAllowingStateLoss();
}
}
}

public _removeBackstackEntries(removed: BackstackEntry[]): void {
Expand Down
Loading
Back | FazBrowse Home | New Git URL