fix(messaging): handle late permissions request

Author: triniwiz

packages/firebase-core/index.android.ts

@@ -173,7 +173,7 @@ export class FirebaseApp {
 	}
 }
 
-let lastActivity;
+let lastActivity: WeakRef<androidx.appcompat.app.AppCompatActivity>;
 export class Firebase {
 	static #onResumeQueue = [];
 	static addToResumeQueue(callback: () => void) {
@@ -221,7 +221,7 @@ export class Firebase {
 
 		Application.android.once('activityCreated', (args: any) => {
 			if (!lastActivity) {
-				lastActivity = args.activity;
+				lastActivity = new WeakRef(args.activity);
 				Firebase.#activityResultContractsQueue.notify({
 					eventName: 'register',
 					activity: args.activity,
@@ -231,8 +231,8 @@ export class Firebase {
 		});
 
 		Application.android.on('activityDestroyed', (args) => {
-			const activity = args.activity;
-			if (lastActivity && activity === lastActivity) {
+			const activity = lastActivity?.get?.();
+			if (activity && args.activity === activity) {
 				Firebase.#activityResultContractsQueue.notify({
 					eventName: 'register',
 					activity: args.activity,
@@ -242,7 +242,7 @@ export class Firebase {
 				lastActivity = undefined;
 				Application.android.once('activityCreated', (args: any) => {
 					if (!lastActivity) {
-						lastActivity = args.activity;
+						lastActivity = new WeakRef(args.activity);
 						Firebase.#activityResultContractsQueue.notify({
 							eventName: 'register',
 							activity: args.activity,

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

@@ -71,6 +71,30 @@ function register(args: any) {
 	}
 }
 
+Application.android.on('activityResumed', (args) => {
+	MessagingCore._inForeground = true;
+	MessagingCore.appDidLaunch = true;
+	MessagingCore._onResumeQueue.forEach((callback) => {
+		callback();
+	});
+	MessagingCore._onResumeQueue.splice(0);
+});
+
+Application.android.on('activityPaused', (args) => {
+	MessagingCore._inForeground = false;
+});
+
+Application.android.once('activityCreated', register);
+
+Application.android.on('activityDestroyed', (args) => {
+	const activity = lastActivity?.get?.();
+	if (activity && args.activity === activity) {
+		requestPermissionLauncher?.unregister?.();
+		lastActivity = undefined;
+		Application.android.once('activityCreated', register);
+	}
+});
+
 export class MessagingCore implements IMessagingCore {
 	#native: com.google.firebase.messaging.FirebaseMessaging;
 	#onMessageCallback?;
@@ -109,14 +133,28 @@ export class MessagingCore implements IMessagingCore {
 		}
 		MessagingCore.#onResumeQueue.push(callback);
 	}
+
+	static get _onResumeQueue() {
+		return this.#onResumeQueue;
+	}
+
 	static #inForeground = false;
+	static set _inForeground(value) {
+		this.#inForeground = value;
+	}
+	static get _inForeground() {
+		return this.#inForeground;
+	}
 	static #appDidLaunch = false;
 	static get inForeground() {
 		return MessagingCore.#inForeground;
 	}
 	static get appDidLaunch() {
 		return MessagingCore.#appDidLaunch;
 	}
+	static set appDidLaunch(value) {
+		MessagingCore.#appDidLaunch = value;
+	}
 
 	constructor() {
 		if (defaultInstance) {
@@ -126,30 +164,6 @@ export class MessagingCore implements IMessagingCore {
 
 		this.#native = com.google.firebase.messaging.FirebaseMessaging.getInstance();
 
-		Application.android.on('activityResumed', (args) => {
-			MessagingCore.#inForeground = true;
-			MessagingCore.#appDidLaunch = true;
-			MessagingCore.#onResumeQueue.forEach((callback) => {
-				callback();
-			});
-			MessagingCore.#onResumeQueue.splice(0);
-		});
-
-		Application.android.on('activityPaused', (args) => {
-			MessagingCore.#inForeground = false;
-		});
-
-		Application.android.once('activityCreated', register);
-
-		Application.android.on('activityDestroyed', (args) => {
-			const activity = lastActivity?.get?.();
-			if (activity && args.activity === activity) {
-				requestPermissionLauncher?.unregister?.();
-				lastActivity = undefined;
-				Application.android.once('activityCreated', register);
-			}
-		});
-
 		org.nativescript.firebase.messaging.FirebaseMessaging.init(Utils.android.getApplicationContext());
 		ensureCallback();