@cloudflare/realtimekit-react-native 0.1.2-staging.5 → 0.1.2-staging.7

package/android/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
   <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30"/>
   <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="30" />
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
   <uses-permission android:name="android.permission.CAMERA"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>

package/android/src/main/java/com/reactnativecore/DyteHelperModule.java

@@ -134,6 +134,7 @@ public class DyteHelperModule extends ReactContextBaseJavaModule {
         for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
             if ((ForegroundService.class).getName().equals(service.service.getClassName())) {
                 promise.resolve(true);
+                return;
             }
         }
         promise.resolve(false);

package/android/src/main/java/com/reactnativecore/ForegroundService.java

@@ -28,7 +28,7 @@ public class ForegroundService extends Service {
                     if (notification != null) {
                         try {
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                                startForeground(notificationHelper.NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION | ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA | ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE);
+                                startForeground(notificationHelper.NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION);
                             } else {
                                 startForeground(notificationHelper.NOTIFICATION_ID, notification);
                             }

package/android/src/main/java/com/reactnativecore/NotificationHelper.java

@@ -22,9 +22,9 @@ import java.util.Random;
 
 class NotificationHelper {
     public  static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
-    private static final String CHANNEL_ID = "DyteNotificationChannel";
-    private static final String CHANNEL_NAME = "Ongoing Conference Notifications";
-    private static final String CHANNEL_DESC = "Ongoing Conference Notifications";
+    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;
@@ -83,18 +83,17 @@ class NotificationHelper {
 
         builder
                 .setCategory(NotificationCompat.CATEGORY_CALL)
-                .setContentTitle("Ongoing Meeting")
-                .setContentText("Tap to return to the meeting")
-                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                .setContentTitle("Screen Share")
+                .setContentText("You are sharing your screen")
+                .setPriority(NotificationCompat.PRIORITY_LOW)
                 .setContentIntent(pendingIntent)
-                .setOngoing(true)
-                .setWhen(System.currentTimeMillis())
-                .setUsesChronometer(true)
-                .setAutoCancel(false)
+                .setOngoing(false)
+                .setUsesChronometer(false)
+                .setAutoCancel(true)
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                 .setOnlyAlertOnce(true)
-                .setSmallIcon(appIconResId);
-
+                .setSmallIcon(appIconResId)
+                .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE);
         if(largeIcon != null){
             builder.setLargeIcon(largeIcon);
         }

package/lib/LocalMediaHandler.d.ts

@@ -26,6 +26,7 @@ export default class LocalMediaHandler extends EventEmitter {
     audioEnabled: boolean;
     videoEnabled: boolean;
     screenShareEnabled: boolean;
+    private _pendingScreenShare;
     currentDevices: {
         audio?: MediaDeviceInfo;
         video?: MediaDeviceInfo;

package/lib/LocalMediaHandler.js

@@ -22,7 +22,7 @@ var _LocalMediaHandler_localMediaUtils, _LocalMediaHandler_appState, _LocalMedia
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { EventEmitter } from 'events';
 import LocalMediaUtils from './LocalMediaUtils';
-import { AppState, NativeEventEmitter, NativeModules, Platform, } from 'react-native';
+import { AppState, NativeEventEmitter, NativeModules, PermissionsAndroid, Platform, } from 'react-native';
 import BackgroundTimer from './BackgroundHandler';
 import InCallManger from './NativeAudioManager';
 import { setupPermissions } from './PermissionHandler';
@@ -47,12 +47,26 @@ function checkIfAudioTrackIsSilent(track) {
 class LocalMediaHandler extends EventEmitter {
     configureForeground() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (Platform.OS !== 'android')
+                return;
             const val = yield DyteHelper.isForegroundServiceRunning();
-            if (Platform.Version >= 26) {
-                yield DyteHelper.createNotificationChannel();
+            if (!val) {
+                if (Platform.Version >= 33) {
+                    const res = yield PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS);
+                    if (res !== PermissionsAndroid.RESULTS.GRANTED) {
+                        console.warn('Permission required for screenshare notification');
+                    }
+                }
+                if (Platform.Version >= 26) {
+                    yield DyteHelper.createNotificationChannel();
+                }
+                try {
+                    yield DyteHelper.startService();
+                }
+                catch (e) {
+                    console.warn('Failed to start foreground service', e);
+                }
             }
-            if (!val)
-                yield DyteHelper.startService();
         });
     }
     constructor(localMediaUtils) {
@@ -61,6 +75,7 @@ class LocalMediaHandler extends EventEmitter {
         _LocalMediaHandler_appState.set(this, void 0);
         _LocalMediaHandler_appStateSubscription.set(this, void 0);
         _LocalMediaHandler_interval.set(this, void 0);
+        this._pendingScreenShare = false;
         this._handleAppStateChange = (nextAppState) => {
             // console.log('App state changed to : ', nextAppState);
             if (__classPrivateFieldGet(this, _LocalMediaHandler_appState, "f").match(/inactive|background/) &&
@@ -78,7 +93,9 @@ class LocalMediaHandler extends EventEmitter {
             }
             else {
                 if (__classPrivateFieldGet(this, _LocalMediaHandler_interval, "f") === null) {
-                    this.configureForeground();
+                    if (this.screenShareEnabled || this._pendingScreenShare) {
+                        this.configureForeground();
+                    }
                 }
                 __classPrivateFieldSet(this, _LocalMediaHandler_interval, BackgroundTimer.setInterval(() => { }, 1000), "f");
                 __classPrivateFieldSet(this, _LocalMediaHandler_appState, nextAppState, "f");
@@ -706,6 +723,12 @@ class LocalMediaHandler extends EventEmitter {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.screenShareEnabled && Platform.OS !== 'ios') {
                 this.removeScreenShareTracks();
+                try {
+                    yield DyteHelper.stopService();
+                }
+                catch (e) {
+                    console.warn('Failed to stop foreground service', e);
+                }
                 return;
             }
             if (Platform.OS === 'ios' && this.screenShareEnabled) {
@@ -713,13 +736,21 @@ class LocalMediaHandler extends EventEmitter {
                 return;
             }
             if (Platform.OS === 'android') {
-                /* getDisplayMedia() needs to be called before configureForeground()
-                  This is because we need to get user permission starting foreground service in Android >=14
-                  1. createScreenCaptureIntent() -> startForeground()
-                */
-                this.setScreenShareTracks(yield LocalMediaUtils.getScreenShareTracks());
+                this._pendingScreenShare = true;
                 yield this.configureForeground();
-                this.screenShareEnabled = true;
+                try {
+                    this.setScreenShareTracks(yield LocalMediaUtils.getScreenShareTracks());
+                    this.screenShareEnabled = true;
+                }
+                catch (e) {
+                    console.warn('Failed to start screenshare', e);
+                    this.screenShareEnabled = false;
+                    yield DyteHelper.stopService();
+                    this._pendingScreenShare = false;
+                }
+                finally {
+                    this._pendingScreenShare = false;
+                }
             }
             if (Platform.OS === 'ios') {
                 NativeModules.DyteScreensharePickerView.showScreenSharePickerView();
@@ -824,6 +855,12 @@ class LocalMediaHandler extends EventEmitter {
     destructMediaHandler() {
         return __awaiter(this, void 0, void 0, function* () {
             __classPrivateFieldGet(this, _LocalMediaHandler_localMediaUtils, "f").destruct();
+            try {
+                yield DyteHelper.stopService();
+            }
+            catch (e) {
+                console.warn('Failed to stop foreground service', e);
+            }
             return this.destruct();
         });
     }

package/lib/LocalMediaUtils.js

@@ -178,7 +178,6 @@ class LocalMediaUtils {
              * is made: https://github.com/microsoft/TypeScript/issues/33232
              */
             const stream = (yield mediaDevices.getDisplayMedia());
-            // console.log('Screenshare stream: ', stream.getVideoTracks());
             return {
                 video: stream.getVideoTracks()[0],
                 audio: stream.getAudioTracks()[0],

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudflare/realtimekit-react-native",
-    "version": "0.1.2-staging.5",
+    "version": "0.1.2-staging.7",
     "description": "Cloudflare RealtimeKit SDK for react native",
     "main": "lib/index.js",
     "author": "Cloudflare",
@@ -38,7 +38,7 @@
         "android"
     ],
     "peerDependencies": {
-        "@cloudflare/react-native-webrtc": "~114.0.16",
+        "@cloudflare/react-native-webrtc": "~114.0.18",
         "@expo/config-plugins": "*",
         "react": "*",
         "react-native": "*"