@daily-co/react-native-daily-js 0.58.0 → 0.59.0

package/README.md

@@ -15,7 +15,7 @@ Install `react-native-daily-js` along with its peer dependencies:
 
 ```bash
 npm i @daily-co/react-native-daily-js @react-native-async-storage/async-storage@^1.15.7 react-native-background-timer@^2.3.1 react-native-get-random-values@^1.9.0
-npm i --save-exact @daily-co/react-native-webrtc@111.0.0-daily.2
+npm i --save-exact @daily-co/react-native-webrtc@118.0.3-daily.1
 ```
 
 Then, follow the below steps to set up your native project on each platform. **Note that these steps assume you're using a version of React Native that supports autolinking (>= 60).**
@@ -93,15 +93,20 @@ Add the following to `AndroidManifest.xml`:
 <uses-permission android:name="android.permission.RECORD_AUDIO" />
 <uses-permission android:name="android.permission.WAKE_LOCK" />
 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
 <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.POST_NOTIFICATIONS"/>
 
 <application>
   // ...
-  <service android:name="com.daily.reactlibrary.DailyOngoingMeetingForegroundService" android:foregroundServiceType="mediaProjection"/>
+  <service android:name="com.daily.reactlibrary.DailyOngoingMeetingForegroundService" android:foregroundServiceType="camera|microphone"/>
 </application>
 ```
 
-> Note: above, `foregroundServiceType` is only needed if you wish to do screen sharing.
+> Note: above, `android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION` is only needed if you wish to do screen sharing.
 
 Update your `minSdkVersion` in your top-level `build.gradle` file:
 

package/android/build.gradle

@@ -1,7 +1,7 @@
-def DEFAULT_COMPILE_SDK_VERSION = 31
-def DEFAULT_BUILD_TOOLS_VERSION = '31.0.0'
+def DEFAULT_COMPILE_SDK_VERSION = 34
+def DEFAULT_BUILD_TOOLS_VERSION = '34.0.0'
 def DEFAULT_MIN_SDK_VERSION = 24
-def DEFAULT_TARGET_SDK_VERSION = 31
+def DEFAULT_TARGET_SDK_VERSION = 34
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -26,7 +26,7 @@ buildscript {
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
+    compileSdk safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
     buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)

package/android/src/main/java/com/daily/reactlibrary/DailyNativeUtils.java

@@ -1,26 +1,48 @@
 package com.daily.reactlibrary;
 
+import android.Manifest;
 import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Process;
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentActivity;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.BaseActivityEventListener;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.PermissionAwareActivity;
+import com.facebook.react.modules.core.PermissionListener;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
-public class DailyNativeUtils extends ReactContextBaseJavaModule {
+public class DailyNativeUtils extends ReactContextBaseJavaModule implements PermissionListener {
 
     private static final String TAG = DailyNativeUtils.class.getName();
+    private static int PERMISSION_REQUEST_CODE = 666;
 
     private final ReactApplicationContext reactContext;
     private Set<String> requestersKeepingDeviceAwake = new HashSet<>();
     private Set<String> requestersShowingOngoingMeetingNotification = new HashSet<>();
 
+    // Info's received to crete the notification
+    private String title;
+    private String subtitle;
+    private String iconName;
+
     public DailyNativeUtils(ReactApplicationContext reactContext) {
         super(reactContext);
         this.reactContext = reactContext;
@@ -74,7 +96,10 @@ public class DailyNativeUtils extends ReactContextBaseJavaModule {
                 } else {
                     requestersShowingOngoingMeetingNotification.remove(requesterId);
                 }
-                updateOngoingMeetingForegroundService(activity, title, subtitle, iconName);
+                this.title = title;
+                this.subtitle = subtitle;
+                this.iconName = iconName;
+                updateOngoingMeetingForegroundService();
             });
         }
     }
@@ -88,9 +113,57 @@ public class DailyNativeUtils extends ReactContextBaseJavaModule {
         }
     }
 
-    private void updateOngoingMeetingForegroundService(Activity activity, String title, String subtitle, String iconName) {
-        if (requestersShowingOngoingMeetingNotification.size() > 0) {
-            DailyOngoingMeetingForegroundService.start(activity.getClass(), title, subtitle, iconName, reactContext);
+    @Override
+    public boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        if (requestCode == PERMISSION_REQUEST_CODE &&
+                Arrays.stream(grantResults).allMatch(result -> result == PackageManager.PERMISSION_GRANTED)) {
+            this.initializeOngoingMeetingForegroundService();
+        } else {
+            System.err.println("Failed to grant permissions.");
+        }
+        return true;
+    }
+
+    private void checkPermissions() {
+        List<String> permissionList = new ArrayList<String>();
+        permissionList.add(Manifest.permission.CAMERA);
+        permissionList.add(Manifest.permission.RECORD_AUDIO);
+        if (Build.VERSION.SDK_INT >= 33) {
+            permissionList.add(Manifest.permission.POST_NOTIFICATIONS);
+        }
+
+        boolean allPermissionsGranted = true;
+        for (String permission : permissionList) {
+            if (ContextCompat.checkSelfPermission(this.reactContext.getApplicationContext(), permission) != PackageManager.PERMISSION_GRANTED) {
+                allPermissionsGranted = false;
+                break;
+            }
+        }
+
+        if (!allPermissionsGranted) {
+            Activity currentActivity = this.reactContext.getCurrentActivity();
+            if (currentActivity instanceof PermissionAwareActivity) {
+                PermissionAwareActivity permissionAware = (PermissionAwareActivity) currentActivity;
+                permissionAware.requestPermissions(permissionList.toArray(new String[0]), PERMISSION_REQUEST_CODE, this);
+            }
+        } else {
+            // Permissions are already granted, we can initialize
+            initializeOngoingMeetingForegroundService();
+        }
+    }
+
+    private void initializeOngoingMeetingForegroundService(){
+        Activity activity = getCurrentActivity();
+        if (activity != null) {
+            activity.runOnUiThread(() -> {
+                DailyOngoingMeetingForegroundService.start(activity.getClass(), title, subtitle, iconName, reactContext);
+            });
+        }
+    }
+
+    private void updateOngoingMeetingForegroundService() {
+        if (!requestersShowingOngoingMeetingNotification.isEmpty()) {
+            this.checkPermissions();
         } else {
             DailyOngoingMeetingForegroundService.stop(reactContext);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daily-co/react-native-daily-js",
-  "version": "0.58.0",
+  "version": "0.59.0",
   "description": "React Native library for making video calls using Daily",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,20 +28,20 @@
     "baseUrl": "https://github.com/daily-co/react-native-daily-js"
   },
   "dependencies": {
-    "@daily-co/daily-js": "^0.60.0",
+    "@daily-co/daily-js": "^0.61.1",
     "@types/react-native-background-timer": "^2.0.0",
     "base-64": "^1.0.0",
     "react-native-url-polyfill": "^1.1.2"
   },
   "///": "WHEN ONE OF THESE CHANGE, PLEASE UPDATE README.md INSTALL SNIPPET ACCORDINGLY",
   "peerDependencies": {
-    "@daily-co/react-native-webrtc": "^111.0.0-daily.2",
+    "@daily-co/react-native-webrtc": "^118.0.3-daily.1",
     "@react-native-async-storage/async-storage": "^1.15.7",
     "react-native-background-timer": "^2.3.1",
     "react-native-get-random-values": "^1.9.0"
   },
   "devDependencies": {
-    "@daily-co/react-native-webrtc": "^111.0.0-daily.2",
+    "@daily-co/react-native-webrtc": "^118.0.3-daily.1",
     "@react-native-async-storage/async-storage": "^1.15.7",
     "@types/base-64": "^1.0.0",
     "react-native-background-timer": "^2.3.1",

package/type-overrides/@daily-co/daily-js/index.d.ts

@@ -1424,15 +1424,15 @@ export interface DailyCall {
   geo(): Promise<{ current: string }>;
   on<T extends DailyEvent>(
     event: T,
-    handler: (event?: DailyEventObject<T>) => void
+    handler: (event: DailyEventObject<T>) => void
   ): DailyCall;
   once<T extends DailyEvent>(
     event: T,
-    handler: (event?: DailyEventObject<T>) => void
+    handler: (event: DailyEventObject<T>) => void
   ): DailyCall;
   off<T extends DailyEvent>(
     event: T,
-    handler: (event?: DailyEventObject<T>) => void
+    handler: (event: DailyEventObject<T>) => void
   ): DailyCall;
   properties: {
     dailyConfig?: DailyAdvancedConfig;