vxrn 2.13.2 → 2.13.4

package/dist/exports/prebuildWithoutExpo.mjs

@@ -3,7 +3,7 @@ import { createHash } from "node:crypto";
 import module from "node:module";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
-import { androidIconSuffix, appIconPreviewResources, iosUsageDescriptions, validateNativeApp } from "@vxrn/utils/nativeAppManifest";
+import { androidAppPermissions, androidIconSuffix, appIconPreviewResources, iosUsageDescriptions, validateNativeApp } from "@vxrn/utils/nativeAppManifest";
 import FSExtra from "fs-extra";
 import sharp from "sharp";
 import { swiftPackageDirectories } from "../utils/swiftPackageId.mjs";
@@ -1731,58 +1731,37 @@ ${phoneOrientations.map((orientation) => `		<string>${orientation}</string>`).jo
 ${anchor}`);
 			}
 		}
-		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml" && (app.imagePicker?.camera !== void 0 || app.speech !== void 0)) {
-			const anchor = "<uses-permission android:name=\"android.permission.INTERNET\" />";
-			if (!rendered.includes(anchor)) {
-				throw new Error("[vxrn] cannot stamp the camera or microphone permission: expected the INTERNET permission in app/src/main/AndroidManifest.xml");
-			}
-			const stamps = [];
-			if (app.imagePicker?.camera !== void 0) {
-				stamps.push("    <uses-permission android:name=\"android.permission.CAMERA\" />");
+		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml") {
+			const permissions = androidAppPermissions(app);
+			if (permissions.size || app.android?.blockedPermissions?.length) {
+				const anchor = "<uses-permission android:name=\"android.permission.INTERNET\" />";
+				if (!rendered.includes(anchor)) {
+					const feature = app.imagePicker?.camera !== void 0 || app.speech !== void 0 ? "the camera or microphone permission" : app.notifications !== void 0 ? "notification permissions" : "permissions";
+					throw new Error(`[vxrn] cannot stamp ${feature}: expected the INTERNET permission in app/src/main/AndroidManifest.xml`);
+				}
+				const blocked = new Set((app.android?.blockedPermissions ?? []).map((name) => name.includes(".") ? name : `android.permission.${name}`));
+				const lines = [...[...permissions].filter(([name]) => !blocked.has(name)).map(([name, maxSdk]) => `    <uses-permission android:name="${name}"${maxSdk === void 0 ? "" : ` android:maxSdkVersion="${maxSdk}"`} />`), ...(app.android?.blockedPermissions ?? []).map((name) => `    <uses-permission android:name="${name.includes(".") ? name : `android.permission.${name}`}" tools:node="remove" />`)];
+				rendered = rendered.replace(anchor, `${anchor}
+${lines.join("\n")}`);
+				if (app.android?.blockedPermissions?.length && !rendered.includes("xmlns:tools=")) {
+					rendered = rendered.replace("xmlns:android=\"http://schemas.android.com/apk/res/android\"", "xmlns:android=\"http://schemas.android.com/apk/res/android\"\n    xmlns:tools=\"http://schemas.android.com/tools\"");
+				}
 			}
 			if (app.speech !== void 0) {
-				stamps.push("    <uses-permission android:name=\"android.permission.RECORD_AUDIO\" />", "    <queries>\n      <intent>\n        <action android:name=\"android.speech.RecognitionService\" />\n      </intent>\n    </queries>");
-			}
-			rendered = rendered.replace(anchor, `${anchor}
-${stamps.join("\n")}`);
-		}
-		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml" && app.location !== void 0) {
-			const anchor = "<uses-permission android:name=\"android.permission.INTERNET\" />";
-			if (!rendered.includes(anchor)) {
-				throw new Error("[vxrn] cannot stamp location permissions: expected the INTERNET permission in app/src/main/AndroidManifest.xml");
-			}
-			const stamps = ["    <uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\" />", "    <uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\" />"];
-			if (app.location.background) {
-				stamps.push("    <uses-permission android:name=\"android.permission.ACCESS_BACKGROUND_LOCATION\" />");
-			}
-			rendered = rendered.replace(anchor, `${anchor}
-${stamps.join("\n")}`);
-		}
-		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml" && app.pedometer !== void 0) {
-			const anchor = "<uses-permission android:name=\"android.permission.INTERNET\" />";
-			if (!rendered.includes(anchor)) {
-				throw new Error("[vxrn] cannot stamp the pedometer permission: expected the INTERNET permission in app/src/main/AndroidManifest.xml");
-			}
-			rendered = rendered.replace(anchor, `${anchor}
-    <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />`);
-		}
-		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml" && app.brightness === true) {
-			const anchor = "<uses-permission android:name=\"android.permission.INTERNET\" />";
-			if (!rendered.includes(anchor)) {
-				throw new Error("[vxrn] cannot stamp the brightness permission: expected the INTERNET permission in app/src/main/AndroidManifest.xml");
+				const anchor = "<uses-permission android:name=\"android.permission.INTERNET\" />";
+				rendered = rendered.replace(anchor, `${anchor}
+    <queries>
+      <intent>
+        <action android:name="android.speech.RecognitionService" />
+      </intent>
+    </queries>`);
 			}
-			rendered = rendered.replace(anchor, `${anchor}
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />`);
 		}
 		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml" && app.notifications !== void 0) {
 			const anchor = "<uses-permission android:name=\"android.permission.INTERNET\" />";
 			if (!rendered.includes(anchor)) {
 				throw new Error("[vxrn] cannot stamp notification permissions: expected the INTERNET permission in app/src/main/AndroidManifest.xml");
 			}
-			rendered = rendered.replace(anchor, [anchor, ...notificationsHost.androidPermissions.map((permission) => `    <uses-permission android:name="${permission}" />`)].join("\n"));
-			if (!rendered.includes(notificationsHost.androidPermissions[0])) {
-				throw new Error("[vxrn] failed to stamp notification permissions into app manifest");
-			}
 			rendered = rendered.replace("      </activity>\n    </application>", `      </activity>
       <receiver android:name="${notificationsHost.receiver}" android:exported="false">
           <intent-filter>
@@ -1815,37 +1794,6 @@ ${stamps.join("\n")}`);
 			if (!rendered.includes(anchor)) {
 				throw new Error("[vxrn] cannot stamp media permissions: expected the INTERNET permission in app/src/main/AndroidManifest.xml");
 			}
-			const stamps = [];
-			if (app.audio?.microphone !== void 0 && !rendered.includes("android.permission.RECORD_AUDIO")) {
-				stamps.push("    <uses-permission android:name=\"android.permission.RECORD_AUDIO\" />");
-			}
-			if (app.photoLibrary?.readWrite !== void 0) {
-				stamps.push("    <uses-permission android:name=\"android.permission.READ_MEDIA_IMAGES\" />", "    <uses-permission android:name=\"android.permission.READ_MEDIA_VIDEO\" />", "    <uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" android:maxSdkVersion=\"32\" />");
-			}
-			if (app.photoLibrary?.addOnly !== void 0) {
-				stamps.push("    <uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" android:maxSdkVersion=\"28\" />");
-			}
-			if (app.contacts !== void 0) {
-				stamps.push("    <uses-permission android:name=\"android.permission.READ_CONTACTS\" />", "    <uses-permission android:name=\"android.permission.WRITE_CONTACTS\" />");
-			}
-			if (app.calendar?.usage !== void 0) {
-				stamps.push("    <uses-permission android:name=\"android.permission.READ_CALENDAR\" />", "    <uses-permission android:name=\"android.permission.WRITE_CALENDAR\" />");
-			}
-			if (app.calendar?.remindersUsage !== void 0) {
-				if (!rendered.includes("android.permission.POST_NOTIFICATIONS")) {
-					stamps.push("    <uses-permission android:name=\"android.permission.POST_NOTIFICATIONS\" />");
-				}
-				if (!rendered.includes("android.permission.RECEIVE_BOOT_COMPLETED")) {
-					stamps.push("    <uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\" />");
-				}
-			}
-			if (app.audio?.background === true) {
-				stamps.push("    <uses-permission android:name=\"android.permission.FOREGROUND_SERVICE\" />", "    <uses-permission android:name=\"android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK\" />");
-			}
-			if (stamps.length) {
-				rendered = rendered.replace(anchor, `${anchor}
-${stamps.join("\n")}`);
-			}
 			const appStamps = [];
 			if (app.calendar?.remindersUsage !== void 0) {
 				appStamps.push("      <meta-data android:name=\"one.calendar.reminders\" android:value=\"true\" />");
@@ -1933,19 +1881,6 @@ ${line}
 			}
 			rendered = rendered.replace(dayNight, app.userInterfaceStyle === "light" ? "parent=\"Theme.AppCompat.Light.NoActionBar\"" : "parent=\"Theme.AppCompat.NoActionBar\"");
 		}
-		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml" && (app.android?.permissions?.length || app.android?.blockedPermissions?.length)) {
-			const anchor = "<uses-permission android:name=\"android.permission.INTERNET\" />";
-			if (!rendered.includes(anchor)) {
-				throw new Error("[vxrn] cannot stamp permissions: expected the INTERNET permission in app/src/main/AndroidManifest.xml");
-			}
-			const permissionName = (name) => name.includes(".") ? name : `android.permission.${name}`;
-			const lines = [...(app.android?.permissions ?? []).map((name) => `    <uses-permission android:name="${permissionName(name)}" />`), ...(app.android?.blockedPermissions ?? []).map((name) => `    <uses-permission android:name="${permissionName(name)}" tools:node="remove" />`)];
-			rendered = rendered.replace(anchor, `${anchor}
-${lines.join("\n")}`);
-			if (app.android?.blockedPermissions?.length && !rendered.includes("xmlns:tools=")) {
-				rendered = rendered.replace("xmlns:android=\"http://schemas.android.com/apk/res/android\"", "xmlns:android=\"http://schemas.android.com/apk/res/android\"\n    xmlns:tools=\"http://schemas.android.com/tools\"");
-			}
-		}
 		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml" && app.android?.appLinks?.length) {
 			rendered = rendered.replace("      </activity>", `        <intent-filter android:autoVerify="true">
             <action android:name="android.intent.action.VIEW" />