Skip to content

fix: crash on Android Tab-View #6466 #6467

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
vakrilov merged 10 commits into from
Nov 14, 2018
Merged

fix: crash on Android Tab-View #6466 #6467

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ef75ff3
fix: crash on Android Tab-View NativeScript#6466
DickSmith Oct 27, 2018
63b592b
Merge branch 'master' into master
DickSmith Oct 29, 2018
0f5c4d6
Merge branch 'master' into master
DickSmith Nov 2, 2018
6e2dfc9
Merge branch 'master' into master
DickSmith Nov 9, 2018
3f48015
Merge branch 'master' into master
Nov 12, 2018
fa09d18
refactor: _commitCurrentTransaction method+comment
Nov 13, 2018
57785a8
chore: fix typo
Nov 13, 2018
99e008e
Merge branch 'master' into master
Nov 13, 2018
397e6c7
Merge branch 'master' into master
manoldonev Nov 14, 2018
d871438
fix: missing class definition
Nov 14, 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
19 changes: 13 additions & 6 deletions tns-core-modules/ui/tab-view/tab-view.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,17 +200,17 @@ function initializeNativeClasses() {
}

finishUpdate(container: android.view.ViewGroup): void {
if (this.mCurTransaction != null) {
(<any>this.mCurTransaction).commitNowAllowingStateLoss();
this.mCurTransaction = null;
}
this._commitCurrentTransaction();
}

isViewFromObject(view: android.view.View, object: java.lang.Object): boolean {
return (<android.support.v4.app.Fragment>object).getView() === view;
}

saveState(): android.os.Parcelable {
// Commit the current transaction on save to prevent "No view found for id 0xa" exception on restore.
// Related to: https://github.com/NativeScript/NativeScript/issues/6466
this._commitCurrentTransaction();
return null;
}

Expand All @@ -221,8 +221,15 @@ function initializeNativeClasses() {
getItemId(position: number): number {
return position;
}
}

private _commitCurrentTransaction() {
if (this.mCurTransaction != null) {
this.mCurTransaction.commitNowAllowingStateLoss();
this.mCurTransaction = null;
}
}
}

PagerAdapter = FragmentPagerAdapter;
}

Expand Down Expand Up @@ -713,4 +720,4 @@ function tryCloneDrawable(value: android.graphics.drawable.Drawable, resources:
}

return value;
}
}