chore(rn, versions): bump rnsdk and update dependencies

* react-native-sdk(chore/overrides): update prepare_sdk script to take care of overrides

.gitignore

@@ -99,10 +99,7 @@ tsconfig.json
 #
 react-native-sdk/*.tgz
 react-native-sdk/android/src
-!react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JitsiMeetOngoingConferenceService.java
 !react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JitsiMeetReactNativePackage.java
-!react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JMOngoingConferenceModule.java
-!react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/RNOngoingNotification.java
 react-native-sdk/images
 react-native-sdk/ios
 react-native-sdk/lang

android/gradle.properties

@@ -26,5 +26,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.bundle.enableUncompressedNativeLibs=false
 
-appVersion=99.0.0
-sdkVersion=99.0.0
+appVersion=24.0.0
+sdkVersion=9.0.0

android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java

@@ -242,7 +242,7 @@ class ReactInstanceManagerHolder {
         options.videoDecoderFactory = new H264AndSoftwareVideoDecoderFactory(eglContext);
         options.videoEncoderFactory = new H264AndSoftwareVideoEncoderFactory(eglContext);
         options.enableMediaProjectionService = true;
-//        options.loggingSeverity = Logging.Severity.LS_INFO;
+//      options.loggingSeverity = Logging.Severity.LS_INFO;
 
         Log.d(TAG, "initializing RN with Activity");
 

ios/app/broadcast-extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>24.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

ios/app/src/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>24.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/app/watchos/app/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>24.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>UISupportedInterfaceOrientations</key>

ios/app/watchos/extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>24.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -629,7 +629,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\nexport NODE_ARGS=\"--max_old_space_size=4096\"\n../../node_modules/react-native/scripts/react-native-xcode.sh\n";
+			shellScript = "WITH_ENVIRONMENT=\"../../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
 		};
 		DE9A016B289A9A9A00E41CBB /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;

ios/sdk/src/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>9.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

ios/sdk/src/Lite-Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>9.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JMOngoingConferenceModule.java

@@ -1,44 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.app.Activity;
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.module.annotations.ReactModule;
-
-
-@ReactModule(name = JMOngoingConferenceModule.NAME)
-class JMOngoingConferenceModule
-    extends ReactContextBaseJavaModule {
-
-    public static final String NAME = "JMOngoingConference";
-
-    public JMOngoingConferenceModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    @ReactMethod
-    public void launch() {
-        Context context = getReactApplicationContext();
-        Activity currentActivity = getCurrentActivity();
-
-        JitsiMeetOngoingConferenceService.launch(context, currentActivity);
-    }
-
-    @ReactMethod
-    public void abort() {
-        Context context = getReactApplicationContext();
-
-        JitsiMeetOngoingConferenceService.abort(context);
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return NAME;
-    }
-}

react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JitsiMeetOngoingConferenceService.java

@@ -1,101 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import android.app.Activity;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.IBinder;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-import java.util.HashMap;
-
-/**
- * This class implements an Android {@link Service}, a foreground one specifically, and it's
- * responsible for presenting an ongoing notification when a conference is in progress.
- * The service will help keep the app running while in the background.
- *
- * See: https://developer.android.com/guide/components/services
- */
-public class JitsiMeetOngoingConferenceService extends Service {
-    private static final String TAG = JitsiMeetOngoingConferenceService.class.getSimpleName();
-
-    public static void launch(Context context, Activity currentActivity) {
-
-        RNOngoingNotification.createOngoingConferenceNotificationChannel(currentActivity);
-
-        Intent intent = new Intent(context, JitsiMeetOngoingConferenceService.class);
-
-        ComponentName componentName;
-
-        try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                componentName = context.startForegroundService(intent);
-            } else {
-                componentName = context.startService(intent);
-            }
-        } catch (RuntimeException e) {
-            // Avoid crashing due to ForegroundServiceStartNotAllowedException (API level 31).
-            // See: https://developer.android.com/guide/components/foreground-services#background-start-restrictions
-            JitsiMeetLogger.w(TAG + " Ongoing conference service not started", e);
-            return;
-        }
-
-        if (componentName == null) {
-            JitsiMeetLogger.w(TAG + " Ongoing conference service not started");
-        }
-    }
-
-    public static void abort(Context context) {
-        Intent intent = new Intent(context, JitsiMeetOngoingConferenceService.class);
-        context.stopService(intent);
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        Notification notification = RNOngoingNotification.buildOngoingConferenceNotification(this);
-
-        if (notification == null) {
-            stopSelf();
-            JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
-        } else {
-            startForeground(RNOngoingNotification.NOTIFICATION_ID, notification);
-            JitsiMeetLogger.i(TAG + " Service started");
-        }
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-
-        return START_NOT_STICKY;
-    }
-}

react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JitsiMeetReactNativePackage.java

@@ -21,7 +21,6 @@ public class JitsiMeetReactNativePackage implements ReactPackage {
                 new AndroidSettingsModule(reactContext),
                 new AppInfoModule(reactContext),
                 new AudioModeModule(reactContext),
-                new JMOngoingConferenceModule(reactContext),
                 new JavaScriptSandboxModule(reactContext),
                 new LocaleDetector(reactContext),
                 new LogBridgeModule(reactContext),

react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/RNOngoingNotification.java

@@ -1,98 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import android.app.Activity;
-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.os.Build;
-
-import androidx.annotation.StringRes;
-import androidx.core.app.NotificationCompat;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-import java.util.Random;
-
-/**
- * Helper class for creating the ongoing notification which is used with
- * {@link JitsiMeetOngoingConferenceService}. It allows the user to easily get back to the app
- * and to hangup from within the notification itself.
- */
-class RNOngoingNotification {
-    private static final String TAG = RNOngoingNotification.class.getSimpleName();
-
-    static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
-
-    static void createOngoingConferenceNotificationChannel(Activity currentActivity) {
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return;
-        }
-
-        if (currentActivity == null) {
-            JitsiMeetLogger.w(TAG + " Cannot create notification channel: no current context");
-            return;
-        }
-
-        NotificationManager notificationManager
-            = (NotificationManager) currentActivity.getSystemService(Context.NOTIFICATION_SERVICE);
-
-        NotificationChannel channel
-            = notificationManager.getNotificationChannel("JitsiOngoingConferenceChannel");
-        if (channel != null) {
-            // The channel was already created, no need to do it again.
-            return;
-        }
-
-        channel = new NotificationChannel("JitsiOngoingConferenceChannel", currentActivity.getString(R.string.ongoing_notification_channel_name), NotificationManager.IMPORTANCE_DEFAULT);
-        channel.enableLights(false);
-        channel.enableVibration(false);
-        channel.setShowBadge(false);
-
-        notificationManager.createNotificationChannel(channel);
-    }
-
-    static Notification buildOngoingConferenceNotification(Context context) {
-
-        if (context == null) {
-            JitsiMeetLogger.w(TAG + " Cannot create notification: no current context");
-            return null;
-        }
-
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "JitsiOngoingConferenceChannel");
-
-        builder
-            .setCategory(NotificationCompat.CATEGORY_CALL)
-            .setContentTitle(context.getString(R.string.ongoing_notification_title))
-            .setContentText(context.getString(R.string.ongoing_notification_text))
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .setOngoing(true)
-            .setWhen(System.currentTimeMillis())
-            .setUsesChronometer(true)
-            .setAutoCancel(false)
-            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-            .setOnlyAlertOnce(true)
-            .setSmallIcon(context.getResources().getIdentifier("ic_notification", "drawable", context.getPackageName()));
-
-        return builder.build();
-    }
-}

react-native-sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jitsi/react-native-sdk",
-    "version": "0.0.0",
+    "version": "2.0.2",
     "description": "React Native SDK for Jitsi Meet.",
     "main": "index.tsx",
     "license": "Apache-2.0",
@@ -11,7 +11,7 @@
         "url": "git+https://github.com/jitsi/jitsi-meet.git"
     },
     "dependencies": {
-        "@jitsi/js-utils": "2.1.3",
+        "@jitsi/js-utils": "2.2.1",
         "@jitsi/logger": "2.0.2",
         "@jitsi/rtcstats": "9.5.1",
         "@react-navigation/bottom-tabs": "6.5.8",
@@ -20,7 +20,7 @@
         "@react-navigation/native": "6.1.7",
         "@react-navigation/stack": "6.3.17",
         "@xmldom/xmldom": "0.8.7",
-        "base64-js": "1.3.1",
+        "base64-js": "1.5.1",
         "grapheme-splitter": "1.0.4",
         "i18n-iso-countries": "6.8.0",
         "i18next": "17.0.6",
@@ -28,7 +28,7 @@
         "i18next-http-backend": "^2.2.1",
         "js-sha512": "0.8.0",
         "jwt-decode": "2.2.0",
-        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1687.0.0+cafe30d7/lib-jitsi-meet.tgz",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1784.0.0+639ad566/lib-jitsi-meet.tgz",
         "lodash": "4.17.21",
         "moment": "2.29.4",
         "moment-duration-format": "2.2.2",
@@ -53,12 +53,14 @@
     },
     "peerDependencies": {
         "@amplitude/react-native": "2.7.0",
+        "@braintree/sanitize-url": "7.0.0",
         "@giphy/react-native-sdk": "2.3.0",
-        "@react-native-async-storage/async-storage": "1.19.3",
+        "@react-native/metro-config": "0.72.9",
+        "@react-native-async-storage/async-storage": "1.19.4",
         "@react-native-community/clipboard": "1.5.1",
-        "@react-native-community/netinfo": "9.4.1",
+        "@react-native-community/netinfo": "11.1.0",
         "@react-native-community/slider": "4.4.3",
-        "@react-native-google-signin/google-signin": "10.0.1",
+        "@react-native-google-signin/google-signin": "10.1.0",
         "react-native": "*",
         "react": "*",
         "react-native-background-timer": "2.4.1",
@@ -72,16 +74,17 @@
         "react-native-pager-view": "6.2.0",
         "react-native-paper": "5.10.3",
         "react-native-performance": "5.0.0",
-        "react-native-orientation-locker": "1.5.0",
+        "react-native-orientation-locker": "1.6.0",
         "react-native-safe-area-context": "4.7.1",
         "react-native-screens": "3.24.0",
         "react-native-sound": "0.11.2",
         "react-native-splash-screen": "3.3.0",
         "react-native-svg": "13.13.0",
-        "react-native-video": "6.0.0-alpha.7",
+        "react-native-video": "6.0.0-alpha.11",
         "react-native-watch-connectivity": "1.1.0",
-        "react-native-webrtc": "111.0.3",
-        "react-native-webview": "13.5.1"
+        "react-native-webrtc": "118.0.2",
+        "react-native-webview": "13.5.1",
+        "text-encoding": "0.7.0"
     },
     "overrides": {
         "@xmldom/xmldom": "0.8.7"
@@ -96,4 +99,4 @@
     "keywords": [
         "react-native"
     ]
-}
+}

react-native-sdk/prepare_sdk.js

@@ -79,6 +79,13 @@ function mergeDependencyVersions() {
         }
     }
 
+    // Updates SDK overrides dependencies.
+    for (const key in packageJSON.overrides) {
+        if (SDKPackageJSON.overrides.hasOwnProperty(key)) {
+            SDKPackageJSON.overrides[key] = packageJSON.overrides[key];
+        }
+    }
+
     const data = JSON.stringify(SDKPackageJSON, null, 4);
 
     fs.writeFileSync('package.json', data);

react/features/mobile/react-native-sdk/middleware.js

@@ -1,5 +1,3 @@
-import { NativeModules, Platform } from 'react-native';
-
 import { getAppProp } from '../../base/app/functions';
 import {
     CONFERENCE_BLURRED,
@@ -11,7 +9,6 @@ import {
 import { SET_AUDIO_MUTED, SET_VIDEO_MUTED } from '../../base/media/actionTypes';
 import { PARTICIPANT_JOINED, PARTICIPANT_LEFT } from '../../base/participants/actionTypes';
 import MiddlewareRegistry from '../../base/redux/MiddlewareRegistry';
-import StateListenerRegistry from '../../base/redux/StateListenerRegistry';
 import { READY_TO_CLOSE } from '../external-api/actionTypes';
 import { participantToParticipantInfo } from '../external-api/functions';
 import { ENTER_PICTURE_IN_PICTURE } from '../picture-in-picture/actionTypes';
@@ -19,7 +16,6 @@ import { ENTER_PICTURE_IN_PICTURE } from '../picture-in-picture/actionTypes';
 import { isExternalAPIAvailable } from './functions';
 
 const externalAPIEnabled = isExternalAPIAvailable();
-const { JMOngoingConference } = NativeModules;
 
 
 /**
@@ -78,21 +74,3 @@ const { JMOngoingConference } = NativeModules;
 
     return result;
 });
-
-/**
- * Before enabling media projection service control on Android,
- * we need to check if native modules are being used or not.
- */
-Platform.OS === 'android' && !externalAPIEnabled && StateListenerRegistry.register(
-    state => state['features/base/conference'].conference,
-    (conference, previousConference) => {
-        if (!conference) {
-            JMOngoingConference.abort();
-        } else if (conference && !previousConference) {
-            JMOngoingConference.launch();
-        } else if (conference !== previousConference) {
-            JMOngoingConference.abort();
-            JMOngoingConference.launch();
-        }
-    }
-);