@cloudflare/realtimekit-react-native 1.1.0 → 1.2.0-staging.1

package/plugin/src/withRTK.ts

@@ -81,23 +81,13 @@ const withIosPermissions: ConfigPlugin<Props> = (
 };
 
 /**
- * Adds the following to the `AndroidManifest.xml`: 
- * <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.BLUETOOTH"/>
-  <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
-  <uses-permission android:name="android.permission.CAMERA"/>
-  <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-  <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-  <uses-permission android:name="android.permission.WAKE_LOCK"/>
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-  <uses-permission android:name="android.permission.MICROPHONE" />
+ * Adds the following permissions to `AndroidManifest.xml`:
+ *   ACCESS_NETWORK_STATE, BLUETOOTH, CAMERA, INTERNET,
+ *   MODIFY_AUDIO_SETTINGS, RECORD_AUDIO, SYSTEM_ALERT_WINDOW, WAKE_LOCK,
+ *   POST_NOTIFICATIONS,
+ *   FOREGROUND_SERVICE, FOREGROUND_SERVICE_CAMERA, FOREGROUND_SERVICE_MICROPHONE,
+ *   FOREGROUND_SERVICE_MEDIA_PLAYBACK,
+ *   WRITE_EXTERNAL_STORAGE, READ_EXTERNAL_STORAGE, MICROPHONE
  */
 const withAndroidPermissions: ConfigPlugin = (config) => {
   return AndroidConfig.Permissions.withPermissions(config, [
@@ -109,8 +99,11 @@ const withAndroidPermissions: ConfigPlugin = (config) => {
     'android.permission.RECORD_AUDIO',
     'android.permission.SYSTEM_ALERT_WINDOW',
     'android.permission.WAKE_LOCK',
+    'android.permission.POST_NOTIFICATIONS',
     'android.permission.FOREGROUND_SERVICE',
-    'android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION',
+    'android.permission.FOREGROUND_SERVICE_CAMERA',
+    'android.permission.FOREGROUND_SERVICE_MICROPHONE',
+    'android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK',
     'android.permission.WRITE_EXTERNAL_STORAGE',
     'android.permission.READ_EXTERNAL_STORAGE',
     'android.permission.MICROPHONE',
@@ -123,11 +116,24 @@ const withAndroidScreenshare: ConfigPlugin = (config) => {
     const app = manifest.manifest.application?.[0];
 
     if (app) {
-      // Avoid duplicate entries
+      const newServiceName =
+        'com.cloudflare.realtimekit.WebRTCModule.MediaProjectionService';
+
+      // Remove the old ForegroundService entry if it exists (migration from previous versions).
+      const oldServiceName = 'com.cloudflare.realtimekit.ForegroundService';
+      if (app.service) {
+        app.service = app.service.filter(
+          (service) => service.$['android:name'] !== oldServiceName
+        );
+      }
+
+      // Add the new MediaProjectionService entry if not already present.
+      // Note: react-native-webrtc's own AndroidManifest.xml also declares this
+      // service, so Expo managed apps that merge library manifests may not need
+      // this entry. It is added here explicitly for safety with bare workflow
+      // apps that do not perform automatic manifest merging.
       const exists = (app.service || []).some(
-        (service) =>
-          service.$['android:name'] ===
-          'com.cloudflare.realtimekit.ForegroundService'
+        (service) => service.$['android:name'] === newServiceName
       );
       if (!exists) {
         app.service = [
@@ -135,8 +141,9 @@ const withAndroidScreenshare: ConfigPlugin = (config) => {
           {
             $: {
               'android:enabled': 'true',
+              'android:exported': 'false',
               'android:foregroundServiceType': 'mediaProjection',
-              'android:name': 'com.cloudflare.realtimekit.ForegroundService',
+              'android:name': newServiceName,
             },
           },
         ];
@@ -167,6 +174,33 @@ const withAndroidBlobProviderAuthority: ConfigPlugin = (config) => {
   });
 };
 
+const withAndroidMeetingService: ConfigPlugin = (config) => {
+  return withAndroidManifest(config, (_config) => {
+    const manifest = _config.modResults as AndroidManifest;
+    const app = manifest.manifest.application?.[0];
+    if (!app) return _config;
+
+    const serviceName = 'com.cloudflare.realtimekit.KeepAliveService';
+    const exists = (app.service || []).some(
+      (service) => service.$['android:name'] === serviceName
+    );
+    if (!exists) {
+      app.service = [
+        ...(app.service || []),
+        {
+          $: {
+            'android:name': serviceName,
+            'android:enabled': 'true',
+            'android:exported': 'false',
+            'android:foregroundServiceType': 'camera|microphone|mediaPlayback',
+          },
+        },
+      ];
+    }
+    return _config;
+  });
+};
+
 const withVoice: ConfigPlugin<Props | void> = (config, props = {}) => {
   const _props = props ? props : {};
   config = withIosPermissions(config, _props);
@@ -174,6 +208,7 @@ const withVoice: ConfigPlugin<Props | void> = (config, props = {}) => {
     config = withAndroidPermissions(config);
   }
   config = withAndroidScreenshare(config);
+  config = withAndroidMeetingService(config);
   config = withAndroidBlobProviderAuthority(config);
   return config;
 };

package/android/src/main/java/com/cloudflare/realtimekit/ForegroundService.java

@@ -1,46 +0,0 @@
-package com.cloudflare.realtimekit;
-
-import android.app.Notification;
-import android.app.Service;
-import android.content.Intent;
-import android.os.Build;
-import android.os.IBinder;
-import android.content.pm.ServiceInfo;
-import android.app.Activity;
-import android.widget.Toast;
-import com.cloudflare.realtimekit.RTKHolder;
-
-public class ForegroundService extends Service {
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        String action = intent.getAction();
-        if (action != null) {
-            if (action.equals(Constants.ACTION_FOREGROUND_SERVICE_START)) {
-                if(RTKHolder.currActivity!=null) {
-                    NotificationHelper notificationHelper = NotificationHelper.getInstance(RTKHolder.currActivity);
-                    Notification notification = notificationHelper.buildNotification(RTKHolder.currActivity);
-                    if (notification != null) {
-                        try {
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                                startForeground(notificationHelper.NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION);
-                            } else {
-                                startForeground(notificationHelper.NOTIFICATION_ID, notification);
-                            }
-                        } catch (RuntimeException e) {
-                            RTKLogger.w("ForegroundService", "Failed to start ForegroundService due to: " + e.getMessage());
-                        }
-                    }
-                }
-
-            } else if (action.equals(Constants.ACTION_FOREGROUND_SERVICE_STOP)) {
-                stopSelf();
-            }
-        }
-        return START_NOT_STICKY;
-
-    }
-}

package/android/src/main/java/com/cloudflare/realtimekit/NotificationHelper.java

@@ -1,126 +0,0 @@
-package com.cloudflare.realtimekit;
-
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.util.Log;
-import androidx.core.app.NotificationCompat;
-
-import com.facebook.react.bridge.Promise;
-
-import java.util.Random;
-
-
-class NotificationHelper {
-    public  static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
-    private static final String CHANNEL_ID = "RealtimeKitNotificationChannel";
-    private static final String CHANNEL_NAME = "Screen Sharing";
-    private static final String CHANNEL_DESC = "Screen Sharing";
-
-    private static NotificationHelper instance = null;
-    private NotificationManager mNotificationManager;
-
-    public static synchronized NotificationHelper getInstance(Context context) {
-        if (instance == null) {
-            instance = new NotificationHelper(context);
-        }
-        return instance;
-    }
-
-    private NotificationHelper(Context context) {
-        mNotificationManager = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
-
-    }
-
-    void createNotificationChannel(Promise promise) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            int channelImportance = NotificationManager.IMPORTANCE_DEFAULT;
-            boolean enableVibration = false;
-            NotificationChannel channel = new NotificationChannel(CHANNEL_ID, CHANNEL_NAME, channelImportance);
-            channel.setDescription(CHANNEL_DESC);
-            channel.enableVibration(enableVibration);
-            mNotificationManager.createNotificationChannel(channel);
-            promise.resolve(null);
-        } else {
-            promise.reject(Constants.ERROR_ANDROID_VERSION, "RTKForegroundService: Notification channel can be created on Android O+");
-        }
-    }
-
-    Notification buildNotification(Context context) {
-        if (context == null) {
-            return null;
-        }
-        Intent notificationIntent = new Intent(context, context.getClass());
-        PendingIntent pendingIntent;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-            pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_MUTABLE);
-        }
-        else {
-            pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-        }
-
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID);
-        final PackageManager packageManager = context.getPackageManager();
-        int appIconResId = android.R.mipmap.sym_def_app_icon;
-        Bitmap largeIcon = null;
-        try {
-            final ApplicationInfo applicationInfo = packageManager.getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
-            appIconResId=applicationInfo.icon;
-            Drawable drawable=applicationInfo.loadIcon(packageManager);
-            largeIcon = ((BitmapDrawable)drawable).getBitmap();
-        } catch (Exception e) {
-            //pass
-        }
-
-        builder
-                .setCategory(NotificationCompat.CATEGORY_CALL)
-                .setContentTitle("Screen Share")
-                .setContentText("You are sharing your screen")
-                .setPriority(NotificationCompat.PRIORITY_LOW)
-                .setContentIntent(pendingIntent)
-                .setOngoing(false)
-                .setUsesChronometer(false)
-                .setAutoCancel(true)
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                .setOnlyAlertOnce(true)
-                .setSmallIcon(appIconResId)
-                .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE);
-        if(largeIcon != null){
-            builder.setLargeIcon(largeIcon);
-        }
-
-        return builder.build();
-    }
-
-    private Class getMainActivityClass(Context context) {
-        String packageName = context.getPackageName();
-        Intent launchIntent = context.getPackageManager().getLaunchIntentForPackage(packageName);
-        if (launchIntent == null || launchIntent.getComponent() == null) {
-            // Log.e("NotificationHelper", "Failed to get launch intent or component");
-            return null;
-        }
-        try {
-            return Class.forName(launchIntent.getComponent().getClassName());
-        } catch (ClassNotFoundException e) {
-            // Log.e("NotificationHelper", "Failed to get main activity class");
-            return null;
-        }
-    }
-
-    private int getResourceIdForResourceName(Context context, String resourceName) {
-        int resourceId = context.getResources().getIdentifier(resourceName, "drawable", context.getPackageName());
-        if (resourceId == 0) {
-            resourceId = context.getResources().getIdentifier(resourceName, "mipmap", context.getPackageName());
-        }
-        return resourceId;
-    }
-}