fix(messaging): API 33 permission request

Author: triniwiz

packages/firebase-core/index.android.ts

@@ -1,5 +1,5 @@
 import { IFirebaseOptions, FirebaseConfig } from '.';
-import { Application, knownFolders, Utils } from '@nativescript/core';
+import { AndroidActivityEventData, Application, fromObject, knownFolders, Utils } from '@nativescript/core';
 export * from './utils';
 declare const __non_webpack_require__;
 export class FirebaseError extends Error {
@@ -173,6 +173,7 @@ export class FirebaseApp {
 	}
 }
 
+let lastActivity;
 export class Firebase {
 	static #onResumeQueue = [];
 	static addToResumeQueue(callback: () => void) {
@@ -181,6 +182,21 @@ export class Firebase {
 		}
 		Firebase.#onResumeQueue.push(callback);
 	}
+	static #activityResultContractsQueue = fromObject({});
+
+	static registerActivityResultContracts(callback: (args: AndroidActivityEventData & { dispose: boolean }) => void) {
+		if (typeof callback !== 'function') {
+			return;
+		}
+		Firebase.#activityResultContractsQueue.on('register', callback);
+	}
+
+	static unregisterActivityResultContracts(callback: (args: AndroidActivityEventData & { dispose: boolean }) => void) {
+		if (typeof callback !== 'function') {
+			return;
+		}
+		Firebase.#activityResultContractsQueue.off('register', callback);
+	}
 	static #appDidLaunch = false;
 	static #inForeground = false;
 	static get inForeground() {
@@ -197,12 +213,45 @@ export class Firebase {
 			Firebase.#onResumeQueue.forEach((callback) => {
 				callback();
 			});
-			Firebase.#onResumeQueue.splice(0);
 		});
 
 		Application.android.on('activityPaused', (args) => {
 			Firebase.#inForeground = false;
 		});
+
+		Application.android.once('activityCreated', (args: any) => {
+			if (!lastActivity) {
+				lastActivity = args.activity;
+				Firebase.#activityResultContractsQueue.notify({
+					eventName: 'register',
+					activity: args.activity,
+					dispose: false,
+				});
+			}
+		});
+
+		Application.android.on('activityDestroyed', (args) => {
+			const activity = args.activity;
+			if (lastActivity && activity === lastActivity) {
+				Firebase.#activityResultContractsQueue.notify({
+					eventName: 'register',
+					activity: args.activity,
+					dispose: true,
+				});
+
+				lastActivity = undefined;
+				Application.android.once('activityCreated', (args: any) => {
+					if (!lastActivity) {
+						lastActivity = args.activity;
+						Firebase.#activityResultContractsQueue.notify({
+							eventName: 'register',
+							activity: args.activity,
+							dispose: false,
+						});
+					}
+				});
+			}
+		});
 		return firebaseInstance;
 	}
 

packages/firebase-core/index.ios.ts

@@ -268,6 +268,9 @@ export class Firebase {
 		}
 		Firebase.#onResumeQueue.push(callback);
 	}
+	static addToActivityCreatedQueue(callback: () => void) {
+		// noop
+	}
 	static #inForeground = false;
 	static #appDidLaunch = false;
 	static get inForeground() {

packages/firebase-messaging-core/index.android.ts

@@ -52,6 +52,25 @@ const onMessageCallbacks: Set<(message: any) => void> = new Set();
 const onTokenCallbacks: Set<(token: any) => void> = new Set();
 const onNotificationTapCallbacks: Set<(message: any) => void> = new Set();
 
+let lastActivity;
+let requestPermissionLauncher: androidx.activity.result.ActivityResultLauncher<any>;
+let _resolve;
+
+function register(args: any) {
+	if (!lastActivity) {
+		lastActivity = args.activity;
+		requestPermissionLauncher = args.activity.registerForActivityResult(
+			new androidx.activity.result.contract.ActivityResultContracts.RequestPermission(),
+			new androidx.activity.result.ActivityResultCallback({
+				onActivityResult(isGranted: boolean) {
+					_resolve?.(isGranted ? 0 : 1);
+					_resolve = undefined;
+				},
+			})
+		);
+	}
+}
+
 export class MessagingCore implements IMessagingCore {
 	#native: com.google.firebase.messaging.FirebaseMessaging;
 	#onMessageCallback?;
@@ -120,6 +139,17 @@ export class MessagingCore implements IMessagingCore {
 			MessagingCore.#inForeground = false;
 		});
 
+		Application.android.once('activityCreated', register);
+
+		Application.android.on('activityDestroyed', (args) => {
+			const activity = args.activity;
+			if (lastActivity && activity === lastActivity) {
+				requestPermissionLauncher?.unregister?.();
+				lastActivity = undefined;
+				Application.android.once('activityCreated', register);
+			}
+		});
+
 		org.nativescript.firebase.messaging.FirebaseMessaging.init(Utils.android.getApplicationContext());
 		ensureCallback();
 
@@ -263,20 +293,13 @@ export class MessagingCore implements IMessagingCore {
 
 			return new Promise((resolve, reject) => {
 				const launch = (activity) => {
-					const requestPermissionLauncher = activity.registerForActivityResult(
-						new androidx.activity.result.contract.ActivityResultContracts.RequestPermission(),
-						new androidx.activity.result.ActivityResultCallback({
-							onActivityResult(isGranted: boolean) {
-								resolve(isGranted ? 0 : 1);
-							},
-						})
-					);
-
+					_resolve = resolve;
 					requestPermissionLauncher.launch((android as any).Manifest.permission.POST_NOTIFICATIONS);
 				};
 
 				if (!activity) {
 					Application.android.once('activityCreated', (args: any) => {
+						register(args);
 						launch(args.activity);
 					});
 				} else {