Skip to content

fix(messaging): delay android messages only until a listener is added #165

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
merged 2 commits into from
Dec 12, 2022
Merged

fix(messaging): delay android messages only until a listener is added #165

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
52f79e1
fix(messaging): delay android messages only until a listener is added
edusperoni Dec 12, 2022
ae58a8e
feat(messaging): add queueing for iOS messages
edusperoni Dec 12, 2022
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
93 changes: 57 additions & 36 deletions packages/firebase-messaging-core/index.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,25 @@ function ensureCallback() {
public onError(error: any): void {}

public onSuccess(message: string): void {
const exec = () => {
const callback = this._owner?.get?.()?.[this._propName];
if (typeof callback === 'function') {
if (this._propName === '_onToken') {
callback(message);
} else if (this._propName === '_onNotificationTap' || this._propName === '_onMessage') {
try {
setTimeout(() => {
callback(JSON.parse(message));
});
} catch (e) {}
} else {
try {
const callback = this._owner?.get?.()?.[this._propName];
if (typeof callback === 'function') {
if (this._propName === '_onToken') {
callback(message);
} else if (this._propName === '_onNotificationTap' || this._propName === '_onMessage') {
try {
setTimeout(() => {
callback(JSON.parse(message));
} catch (e) {}
});
} catch (e) {
// ignore
}
} else {
try {
callback(JSON.parse(message));
} catch (e) {
// ignore
}
}
};
if (!MessagingCore.inForeground || !MessagingCore.appDidLaunch) {
MessagingCore.addToResumeQueue(exec);
} else {
exec();
}
}
}
Expand All @@ -58,23 +55,23 @@ let _permissionQueue: { resolve: Function; reject: Function }[] = [];

function register(args: any) {
if (!lastActivity) {
// Some activities do not implement activity result API
if (args.activity.registerForActivityResult) {
lastActivity = new WeakRef(args.activity);
requestPermissionLauncher = args.activity.registerForActivityResult(
new androidx.activity.result.contract.ActivityResultContracts.RequestPermission(),
new androidx.activity.result.ActivityResultCallback({
onActivityResult(isGranted: boolean) {
_permissionQueue.forEach((callback) => {
callback.resolve(isGranted ? 0 : 1);
});
_permissionQueue.splice(0);
},
})
);
} else {
Application.android.once('activityCreated', register);
}
// Some activities do not implement activity result API
if (args.activity.registerForActivityResult) {
lastActivity = new WeakRef(args.activity);
requestPermissionLauncher = args.activity.registerForActivityResult(
new androidx.activity.result.contract.ActivityResultContracts.RequestPermission(),
new androidx.activity.result.ActivityResultCallback({
onActivityResult(isGranted: boolean) {
_permissionQueue.forEach((callback) => {
callback.resolve(isGranted ? 0 : 1);
});
_permissionQueue.splice(0);
},
})
);
} else {
Application.android.once('activityCreated', register);
}
}
}

Expand Down Expand Up @@ -110,6 +107,8 @@ export class MessagingCore implements IMessagingCore {
onMessageCallbacks.forEach((cb) => {
cb(message);
});
} else {
MessagingCore._messageQueues._onMessage.push(message);
}
}

Expand All @@ -119,6 +118,8 @@ export class MessagingCore implements IMessagingCore {
onNotificationTapCallbacks.forEach((cb) => {
cb(message);
});
} else {
MessagingCore._messageQueues._onNotificationTap.push(message);
}
}

Expand All @@ -128,12 +129,19 @@ export class MessagingCore implements IMessagingCore {
onTokenCallbacks.forEach((cb) => {
cb(token);
});
} else {
MessagingCore._messageQueues._onToken.push(token);
}
}

showNotificationsWhenInForeground: boolean;

static _onResumeQueue = [];
static _messageQueues = {
_onMessage: [],
_onNotificationTap: [],
_onToken: [],
};
static addToResumeQueue(callback: () => void) {
if (typeof callback !== 'function') {
return;
Expand Down Expand Up @@ -235,6 +243,7 @@ export class MessagingCore implements IMessagingCore {
addOnMessage(listener: (message: any) => any) {
if (typeof listener === 'function') {
onMessageCallbacks.add(listener);
this._triggerPendingCallbacks('_onMessage');
}
}

Expand All @@ -248,6 +257,7 @@ export class MessagingCore implements IMessagingCore {
addOnToken(listener: (token: string) => any) {
if (typeof listener === 'function') {
onTokenCallbacks.add(listener);
this._triggerPendingCallbacks('_onToken');
}
}

Expand All @@ -261,6 +271,7 @@ export class MessagingCore implements IMessagingCore {
addOnNotificationTap(listener: (message: any) => any) {
if (typeof listener === 'function') {
onNotificationTapCallbacks.add(listener);
this._triggerPendingCallbacks('_onNotificationTap');
}
}

Expand Down Expand Up @@ -332,6 +343,16 @@ export class MessagingCore implements IMessagingCore {
get isDeviceRegisteredForRemoteMessages(): boolean {
return org.nativescript.firebase.messaging.FirebaseMessaging.hasPermission(Utils.android.getApplicationContext());
}

private _triggerPendingCallbacks(type: keyof typeof MessagingCore._messageQueues) {
const queue = MessagingCore._messageQueues[type];
if (queue.length > 0) {
MessagingCore._messageQueues[type] = [];
queue.forEach((message) => {
this[type](message);
});
}
}
}

export { AuthorizationStatus } from './common';
23 changes: 23 additions & 0 deletions packages/firebase-messaging-core/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ export class MessagingCore implements IMessagingCore {
onMessageCallbacks.forEach((cb) => {
cb(msg);
});
} else {
MessagingCore._messageQueues._onMessage.push(message);
}
}
_onToken(token: string) {
Expand All @@ -57,6 +59,8 @@ export class MessagingCore implements IMessagingCore {
onTokenCallbacks.forEach((cb) => {
cb(token);
});
} else {
MessagingCore._messageQueues._onToken.push(token);
}
}
_onNotificationTap(message: any) {
Expand All @@ -65,10 +69,17 @@ export class MessagingCore implements IMessagingCore {
onNotificationTapCallbacks.forEach((cb) => {
cb(msg);
});
} else {
MessagingCore._messageQueues._onNotificationTap.push(message);
}
}

static _onResumeQueue = [];
static _messageQueues = {
_onMessage: [],
_onNotificationTap: [],
_onToken: [],
};
static addToResumeQueue(callback: () => void) {
if (typeof callback !== 'function') {
return;
Expand Down Expand Up @@ -183,6 +194,7 @@ export class MessagingCore implements IMessagingCore {
addOnMessage(listener: (message: any) => any) {
if (typeof listener === 'function') {
onMessageCallbacks.add(listener);
this._triggerPendingCallbacks('_onMessage');
}
}

Expand All @@ -196,6 +208,7 @@ export class MessagingCore implements IMessagingCore {
addOnToken(listener: (token: string) => any) {
if (typeof listener === 'function') {
onTokenCallbacks.add(listener);
this._triggerPendingCallbacks('_onToken');
}
}

Expand All @@ -209,6 +222,7 @@ export class MessagingCore implements IMessagingCore {
addOnNotificationTap(listener: (message: any) => any) {
if (typeof listener === 'function') {
onNotificationTapCallbacks.add(listener);
this._triggerPendingCallbacks('_onNotificationTap');
}
}

Expand Down Expand Up @@ -314,6 +328,15 @@ export class MessagingCore implements IMessagingCore {
get isDeviceRegisteredForRemoteMessages(): boolean {
return UIApplication.sharedApplication.registeredForRemoteNotifications;
}
private _triggerPendingCallbacks(type: keyof typeof MessagingCore._messageQueues) {
const queue = MessagingCore._messageQueues[type];
if (queue.length > 0) {
MessagingCore._messageQueues[type] = [];
queue.forEach((message) => {
this[type](message);
});
}
}
}

export { AuthorizationStatus } from './common';