Fix android plugin

Author: anna1901

internal/fishjam-chat/app.json

@@ -70,16 +70,6 @@
             "enableVoIPBackgroundMode": true,
             "supportsPictureInPicture": true,
             "broadcastExtensionDisplayName": "Fishjam Screen Broadcast"
-          },
-          "livestream": {
-            "android": {
-              "enableScreensharing": true,
-              "supportsPictureInPicture": true
-            },
-            "ios": {
-              "enableScreensharing": true,
-              "supportsPictureInPicture": true
-            }
           }
         }
       ],

packages/react-native-client/plugin/src/types.ts

@@ -14,15 +14,5 @@ export type FishjamPluginOptions =
         broadcastExtensionTargetName?: string;
         broadcastExtensionDisplayName?: string;
       };
-      livestream?: {
-        android?: {
-          enableScreensharing?: boolean;
-          supportsPictureInPicture?: boolean;
-        };
-        ios?: {
-          enableScreensharing?: boolean;
-          supportsPictureInPicture?: boolean;
-        };
-      };
     }
   | undefined;

packages/react-native-client/plugin/src/withFishjam.ts

@@ -3,107 +3,9 @@ import { withFishjamAndroid } from './withFishjamAndroid';
 import { FishjamPluginOptions } from './types';
 import withFishjamIos from './withFishjamIos';
 
-/**
- * Main Fishjam Expo config plugin.
- *
- * This plugin configures both iOS and Android platforms for Fishjam video calls
- * and optionally for livestreaming functionality.
- *
- * ## Basic Usage (Video Calls)
- *
- * ```json
- * {
- *   "plugins": [
- *     [
- *       "@fishjam-cloud/react-native-client",
- *       {
- *         "android": {
- *           "enableForegroundService": true,
- *           "supportsPictureInPicture": true
- *         },
- *         "ios": {
- *           "enableScreensharing": true,
- *           "enableVoIPBackgroundMode": true,
- *           "supportsPictureInPicture": true
- *         }
- *       }
- *     ]
- *   ]
- * }
- * ```
- *
- * ## Livestreaming Support
- *
- * If you're using the livestream functionality (WHIP/WHEP), add the `livestream` configuration.
- * This will automatically configure the underlying `react-native-whip-whep` package:
- *
- * ```json
- * {
- *   "plugins": [
- *     [
- *       "@fishjam-cloud/react-native-client",
- *       {
- *         "android": {
- *           "enableForegroundService": true,
- *           "supportsPictureInPicture": true
- *         },
- *         "ios": {
- *           "enableScreensharing": true,
- *           "enableVoIPBackgroundMode": true,
- *           "supportsPictureInPicture": true
- *         },
- *         "livestream": {
- *           "android": {
- *             "enableScreensharing": true,
- *             "supportsPictureInPicture": true
- *           },
- *           "ios": {
- *             "enableScreensharing": true,
- *             "supportsPictureInPicture": true
- *           }
- *         }
- *       }
- *     ]
- *   ]
- * }
- * ```
- *
- * The `livestream` configuration adds:
- * - **Android**: ScreenCaptureService for screen sharing in livestreams
- * - **iOS**: Broadcast extension for screen sharing in livestreams
- *
- * @param config - Expo config object
- * @param options - Plugin configuration options
- * @returns Modified config object
- */
 const withFishjam: ConfigPlugin<FishjamPluginOptions> = (config, options) => {
   config = withFishjamAndroid(config, options);
   config = withFishjamIos(config, options);
-
-  if (options?.livestream) {
-    try {
-      const withWhipWhep =
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        require('react-native-whip-whep/plugin/build/withWhipWhep').default;
-
-      // Fishjam's iOS screensharing is enabled, disable whip-whep's screensharing
-      // This ensures only one broadcast extension is created (Fishjam's FishjamScreenBroadcastExtension)
-      // to avoid duplicate broadcast extension targets in the Xcode project
-      if (options?.ios?.enableScreensharing) {
-        options.livestream.ios = {
-          ...options.livestream.ios,
-          enableScreensharing: false,
-        };
-      }
-
-      config = withWhipWhep(config, options.livestream);
-    } catch {
-      console.warn(
-        '[Fishjam] react-native-whip-whep plugin not found. Livestream configuration will be skipped.',
-      );
-    }
-  }
-
   return config;
 };
 

packages/react-native-client/plugin/src/withFishjamAndroid.ts

@@ -18,7 +18,7 @@ const withFishjamForegroundService: ConfigPlugin<FishjamPluginOptions> = (
     const mainApplication = getMainApplicationOrThrow(configuration.modResults);
     mainApplication.service = mainApplication.service || [];
 
-    const newService = {
+    const fishjamService = {
       $: {
         'android:name':
           'io.fishjam.reactnative.foregroundService.FishjamForegroundService',
@@ -27,14 +27,70 @@ const withFishjamForegroundService: ConfigPlugin<FishjamPluginOptions> = (
       },
     };
 
-    const existingServiceIndex = mainApplication.service.findIndex(
-      (service) => service.$['android:name'] === newService.$['android:name'],
+    const whipWhepService = {
+      $: {
+        'android:name':
+          'com.swmansion.reactnativeclient.foregroundService.ScreenCaptureService',
+        'android:foregroundServiceType': 'mediaProjection',
+        'android:stopWithTask': 'true',
+      },
+    };
+
+    // Add Fishjam service
+    const existingFishjamServiceIndex = mainApplication.service.findIndex(
+      (service) => service.$['android:name'] === fishjamService.$['android:name'],
+    );
+
+    if (existingFishjamServiceIndex !== -1) {
+      mainApplication.service[existingFishjamServiceIndex] = fishjamService;
+    } else {
+      mainApplication.service.push(fishjamService);
+    }
+
+    // Add WhipWhep service
+    const existingWhipWhepServiceIndex = mainApplication.service.findIndex(
+      (service) => service.$['android:name'] === whipWhepService.$['android:name'],
     );
 
-    if (existingServiceIndex !== -1) {
-      mainApplication.service[existingServiceIndex] = newService;
+    if (existingWhipWhepServiceIndex !== -1) {
+      mainApplication.service[existingWhipWhepServiceIndex] = whipWhepService;
     } else {
-      mainApplication.service.push(newService);
+      mainApplication.service.push(whipWhepService);
+    }
+
+    return configuration;
+  });
+
+const withFishjamForegroundServicePermission: ConfigPlugin<FishjamPluginOptions> = (
+  config,
+  props,
+) =>
+  withAndroidManifest(config, (configuration) => {
+    if (!props?.android?.enableForegroundService) {
+      return configuration;
+    }
+
+    const mainApplication = configuration.modResults;
+    if (!mainApplication.manifest) {
+      return configuration;
+    }
+
+    if (!mainApplication.manifest['uses-permission']) {
+      mainApplication.manifest['uses-permission'] = [];
+    }
+
+    const permissions = mainApplication.manifest['uses-permission'];
+
+    const hasForegroundServicePermission = permissions.some(
+      (perm) => perm.$?.['android:name'] === 'android.permission.FOREGROUND_SERVICE',
+    );
+
+    if (!hasForegroundServicePermission) {
+      permissions.push({
+        $: {
+          'android:name': 'android.permission.FOREGROUND_SERVICE',
+        },
+      });
     }
 
     return configuration;
@@ -61,6 +117,7 @@ export const withFishjamAndroid: ConfigPlugin<FishjamPluginOptions> = (
   config,
   props,
 ) => {
+  config = withFishjamForegroundServicePermission(config, props);
   config = withFishjamForegroundService(config, props);
   config = withFishjamPictureInPicture(config, props);
   return config;