fix: address PR review feedback

- Add explicit android:priority="10" on intent filter
- Add utf-8 encoding to writeFileSync for generated Kotlin source
- Add test for preserving pre-existing services in AndroidManifest
- Exclude __tests__ from tsconfig to match existing JS test convention
- Remove unnecessary comments

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Rosie-Kennelly-1

__tests__/withAndroidPushNotifications.test.ts

@@ -1,9 +1,6 @@
 import path from 'path';
 import fs from 'fs';
 
-// Mock @expo/config-plugins so we don't need the full Expo runtime.
-// withDangerousMod and withAndroidManifest just invoke their callbacks
-// immediately with the config object, simulating what Expo does at prebuild.
 jest.mock('@expo/config-plugins', () => ({
   withDangerousMod: (config: any, [_platform, callback]: [string, Function]) =>
     callback(config),
@@ -18,10 +15,6 @@ jest.mock('@expo/config-plugins', () => ({
 
 import { withAndroidPushNotifications } from '../src/expo-plugins/withAndroidPushNotifications';
 
-/**
- * Helper to create a minimal Expo config object that the plugins expect.
- * Mirrors the shape that Expo passes during prebuild.
- */
 function createMockConfig(packageName?: string) {
   return {
     name: 'TestApp',
@@ -91,21 +84,16 @@ describe('withAndroidPushNotifications', () => {
 
       const content = writeFileSyncSpy.mock.calls[0][1] as string;
 
-      // Token forwarding
       expect(content).toContain(
         'IntercomModule.sendTokenToIntercom(application, refreshedToken)'
       );
-      // Message filtering
       expect(content).toContain(
         'IntercomModule.isIntercomPush(remoteMessage)'
       );
-      // Intercom message handling
       expect(content).toContain(
         'IntercomModule.handleRemotePushMessage(application, remoteMessage)'
       );
-      // Non-Intercom passthrough
       expect(content).toContain('super.onMessageReceived(remoteMessage)');
-      // Token passthrough
       expect(content).toContain('super.onNewToken(refreshedToken)');
     });
 
@@ -147,7 +135,8 @@ describe('withAndroidPushNotifications', () => {
       });
       expect(writeFileSyncSpy).toHaveBeenCalledWith(
         path.join(expectedDir, 'IntercomFirebaseMessagingService.kt'),
-        expect.any(String)
+        expect.any(String),
+        'utf-8'
       );
     });
   });
@@ -167,7 +156,7 @@ describe('withAndroidPushNotifications', () => {
       expect(service.$['android:exported']).toBe('false');
     });
 
-    test('registers MESSAGING_EVENT intent filter', () => {
+    test('registers MESSAGING_EVENT intent filter with priority', () => {
       const config = createMockConfig('com.example.myapp');
       withAndroidPushNotifications(config as any, {} as any);
 
@@ -178,12 +167,32 @@ describe('withAndroidPushNotifications', () => {
       expect(action.$['android:name']).toBe(
         'com.google.firebase.MESSAGING_EVENT'
       );
+      expect(intentFilter.$['android:priority']).toBe('10');
+    });
+
+    test('preserves existing services when adding Intercom service', () => {
+      const config = createMockConfig('com.example.myapp');
+
+      config.modResults.manifest.application[0].service.push({
+        $: {
+          'android:name': '.SomeOtherService',
+          'android:exported': 'false',
+        },
+      } as any);
+
+      withAndroidPushNotifications(config as any, {} as any);
+
+      const services = config.modResults.manifest.application[0].service;
+      expect(services).toHaveLength(2);
+      expect(services[0].$['android:name']).toBe('.SomeOtherService');
+      expect(services[1].$['android:name']).toBe(
+        '.IntercomFirebaseMessagingService'
+      );
     });
 
     test('does not duplicate service on repeated runs (idempotency)', () => {
       const config = createMockConfig('com.example.myapp');
 
-      // Run plugin twice on the same config
       withAndroidPushNotifications(config as any, {} as any);
       withAndroidPushNotifications(config as any, {} as any);
 
@@ -194,7 +203,7 @@ describe('withAndroidPushNotifications', () => {
 
   describe('error handling', () => {
     test('throws if android.package is not defined', () => {
-      const config = createMockConfig(); // no package name
+      const config = createMockConfig();
 
       expect(() => {
         withAndroidPushNotifications(config as any, {} as any);

src/expo-plugins/withAndroidPushNotifications.ts

@@ -70,7 +70,8 @@ const writeFirebaseService: ConfigPlugin<IntercomPluginProps> = (_config) =>
       fs.mkdirSync(serviceDir, { recursive: true });
       fs.writeFileSync(
         path.join(serviceDir, `${SERVICE_CLASS_NAME}.kt`),
-        generateFirebaseServiceKotlin(packageName)
+        generateFirebaseServiceKotlin(packageName),
+        'utf-8'
       );
 
       return config;
@@ -97,7 +98,6 @@ const registerServiceInManifest: ConfigPlugin<IntercomPluginProps> = (
 
     const serviceName = `.${SERVICE_CLASS_NAME}`;
 
-    // Check if the service is already registered (idempotency)
     const existingService = mainApplication.service?.find(
       (s) => s.$?.['android:name'] === serviceName
     );
@@ -114,6 +114,9 @@ const registerServiceInManifest: ConfigPlugin<IntercomPluginProps> = (
         },
         'intent-filter': [
           {
+            $: {
+              'android:priority': '10',
+            } as any,
             action: [
               {
                 $: {

src/expo-plugins/withPushNotifications.ts

@@ -60,10 +60,8 @@ export const withIntercomPushNotification: ConfigPlugin<IntercomPluginProps> = (
   props
 ) => {
   let newConfig = config;
-  // iOS push notification setup
   newConfig = appDelegate(newConfig, props);
   newConfig = infoPlist(newConfig, props);
-  // Android push notification setup
   newConfig = withAndroidPushNotifications(newConfig, props);
   return newConfig;
 };

tsconfig.json

@@ -25,5 +25,5 @@
     "strict": true,
     "target": "esnext"
   },
-  "exclude": ["examples"]
+  "exclude": ["examples", "__tests__"]
 }