fix: admob issues

src/components/settingsPage.scss

@@ -60,6 +60,11 @@ wc-page.main-settings-page {
 	.main-settings-list>.list-item,
 	.settings-section-card>.list-item {
 		display: flex;
+
+		&[hidden] {
+			display: none;
+		}
+
 		width: 100%;
 		min-height: 64px;
 		margin: 0;

src/lib/adConsentCoordinator.mjs

@@ -35,6 +35,7 @@ export class AdConsentCoordinator {
 	#state = EMPTY_PRIVACY_STATE;
 	#consentPromise;
 	#adStartPromise;
+	#privacyOptionsPromise;
 	#listeners = new Set();
 
 	constructor({ privacy, initializeAds, onError = console.error }) {
@@ -51,7 +52,14 @@ export class AdConsentCoordinator {
 		return (this.#consentPromise ??= this.#gatherAndStart());
 	}
 
-	async showPrivacyOptions() {
+	showPrivacyOptions() {
+		this.#privacyOptionsPromise ??= this.#showPrivacyOptions().finally(() => {
+			this.#privacyOptionsPromise = undefined;
+		});
+		return this.#privacyOptionsPromise;
+	}
+
+	async #showPrivacyOptions() {
 		const state = await this.#privacy.showOptions();
 		this.#setState(state);
 		await this.#startAdsIfAllowed();

src/lib/bannerVisibilityController.mjs

@@ -10,6 +10,9 @@ export const BANNER_SUPPRESSION_REASON = Object.freeze({
 	REWARDED_PASS: "rewarded-pass",
 });
 
+const DEFAULT_RETRY_DELAY_MS = 500;
+const TRANSIENT_LOAD_ERROR_CODES = new Set([0, 2, 3, 9]);
+
 export class BannerVisibilityController {
 	#banner = null;
 	#registeredPages = new WeakSet();
@@ -20,9 +23,13 @@ export class BannerVisibilityController {
 	#suppressions = new Set();
 	#nativeVisible = false;
 	#scheduledVisible = false;
+	#desiredVisible = false;
 	#operation = Promise.resolve();
 	#revision = 0;
 	#onError;
+	#retryTimer = null;
+	#retryUsed = false;
+	#stopBannerListeners = [];
 
 	constructor({
 		getActivePage,
@@ -35,9 +42,13 @@ export class BannerVisibilityController {
 	}
 
 	setBanner(banner) {
+		this.#stopListeningToBanner();
+		this.#resetRetry();
+		this.#revision++;
 		this.#banner = banner;
 		this.#nativeVisible = false;
 		this.#scheduledVisible = false;
+		this.#listenToBanner(banner);
 		this.reconcile();
 	}
 
@@ -83,6 +94,12 @@ export class BannerVisibilityController {
 			activePage !== null &&
 			this.#registeredPages.has(activePage);
 		const shouldShow = pageRequestsBanner && !this.#keyboardVisible;
+		const eligibilityChanged = shouldShow !== this.#desiredVisible;
+		this.#desiredVisible = shouldShow;
+
+		if (!shouldShow || eligibilityChanged) {
+			this.#resetRetry();
+		}
 
 		if (this.#banner) {
 			this.#banner.active = pageRequestsBanner;
@@ -98,7 +115,12 @@ export class BannerVisibilityController {
 	dispose() {
 		this.#stopObserving?.();
 		this.#stopObserving = null;
+		this.#stopListeningToBanner();
+		this.#resetRetry();
 		this.#banner = null;
+		this.#desiredVisible = false;
+		this.#nativeVisible = false;
+		this.#scheduledVisible = false;
 		this.#revision++;
 	}
 
@@ -107,9 +129,16 @@ export class BannerVisibilityController {
 		this.#stopObserving = this.#observePageChanges(() => this.reconcile());
 	}
 
-	#queueNativeVisibility(shouldShow) {
+	#queueNativeVisibility(shouldShow, isRetry = false) {
 		const banner = this.#banner;
-		if (!banner || shouldShow === this.#scheduledVisible) return;
+		if (
+			!banner ||
+			shouldShow === this.#scheduledVisible ||
+			(shouldShow &&
+				(this.#retryTimer !== null || (this.#retryUsed && !isRetry)))
+		) {
+			return;
+		}
 
 		this.#scheduledVisible = shouldShow;
 		const revision = ++this.#revision;
@@ -124,14 +153,80 @@ export class BannerVisibilityController {
 					} else {
 						await banner.hide?.();
 					}
+					if (revision !== this.#revision || banner !== this.#banner) return;
 					this.#nativeVisible = shouldShow;
 				} catch (error) {
+					if (revision !== this.#revision || banner !== this.#banner) return;
 					this.#nativeVisible = !shouldShow;
 					this.#scheduledVisible = !shouldShow;
 					this.#onError(error);
+					if (shouldShow) this.#scheduleRetry();
 				}
 			});
 	}
+
+	#listenToBanner(banner) {
+		if (typeof banner?.on !== "function") return;
+
+		for (const [eventName, listener] of [
+			["load", () => this.#handleBannerLoad()],
+			["loadfail", (event) => this.#handleBannerLoadFailure(event)],
+		]) {
+			const stopListening = banner.on(eventName, listener);
+			if (typeof stopListening === "function") {
+				this.#stopBannerListeners.push(stopListening);
+			}
+		}
+	}
+
+	#stopListeningToBanner() {
+		for (const stopListening of this.#stopBannerListeners.splice(0)) {
+			stopListening();
+		}
+	}
+
+	#handleBannerLoad() {
+		this.#resetRetry();
+		if (!this.#desiredVisible) return;
+
+		this.#nativeVisible = true;
+		this.#scheduledVisible = true;
+	}
+
+	#handleBannerLoadFailure(event) {
+		this.#nativeVisible = false;
+		this.#scheduledVisible = false;
+		this.#onError(event);
+
+		const errorCode = Number(event?.code);
+		if (TRANSIENT_LOAD_ERROR_CODES.has(errorCode)) {
+			this.#scheduleRetry();
+		} else {
+			this.#retryUsed = true;
+		}
+	}
+
+	#scheduleRetry() {
+		if (!this.#desiredVisible || this.#retryTimer !== null || this.#retryUsed) {
+			return;
+		}
+
+		this.#retryUsed = true;
+		const banner = this.#banner;
+		this.#retryTimer = setTimeout(() => {
+			this.#retryTimer = null;
+			if (!this.#desiredVisible || banner !== this.#banner) return;
+			this.#queueNativeVisibility(true, true);
+		}, DEFAULT_RETRY_DELAY_MS);
+	}
+
+	#resetRetry() {
+		if (this.#retryTimer !== null) {
+			clearTimeout(this.#retryTimer);
+			this.#retryTimer = null;
+		}
+		this.#retryUsed = false;
+	}
 }
 
 function getActivePage() {

src/lib/startAd.js

@@ -63,7 +63,9 @@ export function subscribePrivacyState(listener) {
 }
 
 export async function showPrivacyOptions() {
-	if (!canUseAdmob()) return getPrivacyState();
+	if (!canUseAdmob()) {
+		throw new Error("AdMob Privacy Choices are unavailable.");
+	}
 	return getConsentCoordinator().showPrivacyOptions();
 }
 

src/plugins/admob/src/android/cordova/Privacy.kt

@@ -80,12 +80,26 @@ internal class Privacy(private val plugin: AdMob) {
 
     fun showOptions(ctx: ExecuteContext) {
         plugin.activity.runOnUiThread {
-            UserMessagingPlatform.showPrivacyOptionsForm(plugin.activity) { formError ->
-                if (formError != null) {
-                    ctx.reject("UMP ${formError.errorCode}: ${formError.message}")
-                } else {
-                    ctx.resolve(currentState().toMap())
+            val activity = plugin.activity
+            val state = currentState()
+            if (!state.privacyOptionsRequired) {
+                return@runOnUiThread ctx.resolve(state.toMap())
+            }
+
+            if (activity.isFinishing || activity.isDestroyed) {
+                return@runOnUiThread ctx.reject("Privacy Choices are temporarily unavailable")
+            }
+
+            try {
+                UserMessagingPlatform.showPrivacyOptionsForm(activity) { formError ->
+                    if (formError != null) {
+                        ctx.reject("UMP ${formError.errorCode}: ${formError.message}")
+                    } else {
+                        ctx.resolve(currentState().toMap())
+                    }
                 }
+            } catch (error: Exception) {
+                ctx.reject(error.message ?: "Unable to open Privacy Choices")
             }
         }
     }

src/settings/mainSettings.js

@@ -251,10 +251,19 @@ export default function mainSettings() {
 				break;
 
 			case "privacyChoices":
+				loader.create(
+					strings["privacy choices"] || "Privacy Choices",
+					strings["loading..."] || "Loading...",
+				);
 				try {
 					await showPrivacyOptions();
 				} catch (error) {
-					helpers.error(error);
+					console.warn("Unable to open AdMob Privacy Choices:", error);
+					helpers.error(
+						"Unable to open Privacy Choices. Check your connection and try again.",
+					);
+				} finally {
+					loader.destroy();
 				}
 				break;
 

src/sidebarApps/extensions/index.js

@@ -836,11 +836,14 @@ function ListItem({
 					});
 
 				const { default: installPlugin } = await import("lib/installPlugin");
-				await installPlugin(
-					id,
-					remotePlugin.name,
-					purchaseToken ? purchaseToken : undefined,
-				);
+				await Promise.all([
+					loadAd(),
+					installPlugin(
+						id,
+						remotePlugin.name,
+						purchaseToken ? purchaseToken : undefined,
+					),
+				]);
 
 				const searchInput = container.querySelector('input[name="search-ext"]');
 				if (searchInput) {
@@ -862,6 +865,7 @@ function ListItem({
 				if (!$installed.collapsed) {
 					$installed.ontoggle();
 				}
+				await helpers.showInterstitialIfReady();
 
 				async function getPurchase(sku) {
 					const purchases = await helpers.promisify(iap.getPurchases);
@@ -910,14 +914,11 @@ function ListItem({
 	return $el;
 }
 
-async function loadAd(el) {
+async function loadAd() {
 	if (!helpers.canShowAds()) return;
 	try {
 		if (!(await interstitialAd?.isLoaded())) {
-			const oldText = el.textContent;
-			el.textContent = strings["loading..."];
 			await interstitialAd?.load();
-			el.textContent = oldText;
 		}
 	} catch (error) {
 		console.error(error);
@@ -929,7 +930,7 @@ async function uninstall(id) {
 		const pluginDir = Url.join(PLUGIN_DIR, id);
 		const state = await InstallState.new(id);
 		await Promise.all([
-			loadAd(this),
+			loadAd(),
 			fsOperation(pluginDir).delete(),
 			state.delete(state.storeUrl),
 		]);