fix(android): Do not add duplicate queries and package entries

- use existing queries tag to append packages

Author: Mantu

example/android/app/src/main/AndroidManifest.xml

@@ -10,15 +10,10 @@
       <category android:name="android.intent.category.BROWSABLE"/>
       <data android:scheme="https"/>
     </intent>
-  </queries>
-  <queries>
-    <package android:name="com.google.android.apps.fitness"/>
-    <package android:name="com.android.chrome"/>
-  </queries>
-  <queries>
     <package android:name="com.google.android.apps.fitness"/>
     <package android:name="com.android.chrome"/>
     <package android:name="com.expo.flash.qr"/>
+    <package android:name="com.test.this"/>
   </queries>
   <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme">
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>

example/android/gradle.properties

@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

example/app.json

@@ -24,12 +24,13 @@
     },
     "plugins": [
       [
-        "expo-check-installed-apps",
+        "../app.plugin.js",
         {
           "android": [
             "com.google.android.apps.fitness",
             "com.android.chrome",
-            "com.expo.flash.qr"
+            "com.expo.flash.qr",
+            "com.test.this"
           ],
           "ios": ["fb", "twitter"]
         }

example/package.json

@@ -11,8 +11,7 @@
   "dependencies": {
     "expo": "~51.0.28",
     "react": "18.2.0",
-    "react-native": "0.74.5",
-    "expo-check-installed-apps": "0.2.6"
+    "react-native": "0.74.5"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

example/yarn.lock

@@ -2908,11 +2908,6 @@ expo-asset@~10.0.10:
     invariant "^2.2.4"
     md5-file "^3.2.3"
 
-[email protected]:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/expo-check-installed-apps/-/expo-check-installed-apps-0.2.5.tgz#1882e41d532fc7aa28d0892006b68997bda7995f"
-  integrity sha512-2G4TJyiLQz4ct5HcaXtYFAanuT5VGSoftm7jT4FT8dD2FgyXwqoTyGY6G/YTRHwMkfcHBKSLNxWF1Ofx9dJkZA==
-
 expo-constants@~16.0.0:
   version "16.0.2"
   resolved "https://registry.npmjs.org/expo-constants/-/expo-constants-16.0.2.tgz"

plugin/src/index.ts

@@ -27,17 +27,40 @@ const withAndroid: ConfigPlugin<PluginOptions> = (config, { android }) => {
       manifest.queries = [];
     }
 
-    // Create a single new <queries> block with all new packages
-    const newPackages = android.map((packageName) => ({
-      $: { "android:name": packageName },
-    }));
-
-    const newQueriesBlock = {
-      package: newPackages,
-    };
+    // Use the first <queries> block in the manifest
+    const existingQueries = manifest.queries.find(
+      (query) => query.intent || query.package
+    );
 
-    // Append the new <queries> block while preserving existing blocks
-    manifest.queries.push(newQueriesBlock);
+    if (existingQueries) {
+      // Add packages to the existing <queries> block
+      if (!existingQueries.package) {
+        existingQueries.package = [];
+      }
+
+      const existingPackageNames = new Set(
+        existingQueries.package.map((pkg: any) => pkg.$["android:name"])
+      );
+
+      const newPackages = android
+        .filter((packageName) => !existingPackageNames.has(packageName))
+        .map((packageName) => ({
+          $: { "android:name": packageName },
+        }));
+
+      if (newPackages.length > 0) {
+        existingQueries.package.push(...newPackages);
+      }
+    } else {
+      // Create a new <queries> block if none exists
+      const newPackages = android.map((packageName) => ({
+        $: { "android:name": packageName },
+      }));
+
+      manifest.queries.push({
+        package: newPackages,
+      });
+    }
 
     return config;
   });