Skip to content

fix(android): raise resume event on activity.onPostResume() #6766

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 2 commits into from
Jan 8, 2019
Merged

fix(android): raise resume event on activity.onPostResume() #6766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8a1f1b
fix(android): raise resume event on activity.onPostResume()
manoldonev Jan 7, 2019
a210913
Merge branch 'master' into mdonev/activity-onpostresume-fix
manoldonev Jan 8, 2019
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
7 changes: 1 addition & 6 deletions tns-core-modules/application/application.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,15 +290,10 @@ function initLifecycleCallbacks() {
onActivityResumed: profile("onActivityResumed", function (activity: android.support.v7.app.AppCompatActivity) {
androidApp.foregroundActivity = activity;

if ((<any>activity).isNativeScriptActivity) {
notify(<ApplicationEventData>{ eventName: resumeEvent, object: androidApp, android: activity });
androidApp.paused = false;
}

androidApp.notify(<AndroidActivityEventData>{ eventName: ActivityResumed, object: androidApp, activity: activity });
}),

onActivitySaveInstanceState: profile("onActivityResumed", function (activity: android.support.v7.app.AppCompatActivity, outState: android.os.Bundle) {
onActivitySaveInstanceState: profile("onActivitySaveInstanceState", function (activity: android.support.v7.app.AppCompatActivity, outState: android.os.Bundle) {
androidApp.notify(<AndroidActivityBundleEventData>{ eventName: SaveActivityState, object: androidApp, activity: activity, bundle: outState });
}),

Expand Down
4 changes: 4 additions & 0 deletions tns-core-modules/ui/frame/activity.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ class NativeScriptActivity extends android.support.v7.app.AppCompatActivity {
this._callbacks.onDestroy(this, super.onDestroy);
}

public onPostResume(): void {
this._callbacks.onPostResume(this, super.onPostResume);
}

public onBackPressed(): void {
this._callbacks.onBackPressed(this, super.onBackPressed);
}
Expand Down
28 changes: 26 additions & 2 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 @@ -859,13 +859,13 @@ class FragmentCallbacksImplementation implements AndroidFragmentCallbacks {
// lose its parent we temporarily add it to the parent, and then remove it (addViewInLayout doesn't trigger layout pass)
const nativeView = page.nativeViewProtected;
if (nativeView != null) {
const parentView = nativeView.getParent();
const parentView = nativeView.getParent();
if (parentView instanceof android.view.ViewGroup) {
if (parentView.getChildCount() === 0) {
parentView.addViewInLayout(nativeView, -1, new org.nativescript.widgets.CommonLayoutParams());
}

parentView.removeView(nativeView);
parentView.removeView(nativeView);
}
}

Expand Down Expand Up @@ -1006,6 +1006,30 @@ class ActivityCallbacksImplementation implements AndroidActivityCallbacks {
}
}

@profile
public onPostResume(activity: any, superFunc: Function): void {
superFunc.call(activity);

if (traceEnabled()) {
traceWrite("NativeScriptActivity.onPostResume();", traceCategories.NativeLifecycle);
}

// NOTE: activity.onPostResume() is called when activity resume is complete and we can
// safely raise the application resume event;
// onActivityResumed(...) lifecycle callback registered in application is called too early
// and raising the application resume event there causes issues like
// https://github.com/NativeScript/NativeScript/issues/6708
if ((<any>activity).isNativeScriptActivity) {
const args = <application.ApplicationEventData>{
eventName: application.resumeEvent,
object: application.android,
android: activity
};
application.notify(args);
application.android.paused = false;
}
}

@profile
public onDestroy(activity: any, superFunc: Function): void {
if (traceEnabled()) {
Expand Down
1 change: 1 addition & 0 deletions tns-core-modules/ui/frame/frame.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ export interface AndroidActivityCallbacks {
onSaveInstanceState(activity: any, outState: any, superFunc: Function): void;
onStart(activity: any, superFunc: Function): void;
onStop(activity: any, superFunc: Function): void;
onPostResume(activity: any, superFunc: Function): void;
onDestroy(activity: any, superFunc: Function): void;
onBackPressed(activity: any, superFunc: Function): void;
onRequestPermissionsResult(activity: any, requestCode: number, permissions: Array<String>, grantResults: Array<number>, superFunc: Function): void;
Expand Down