agora-appbuilder-core 4.0.0-beta.79 → 4.0.0-beta.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-appbuilder-core",
-  "version": "4.0.0-beta.79",
+  "version": "4.0.0-beta.80",
   "description": "React Native template for RTE app builder",
   "main": "index.js",
   "files": [

package/template/bridge/rtc/webNg/RtcEngine.ts

@@ -174,27 +174,10 @@ interface RemoteStream {
 }
 
 if ($config.GEO_FENCING) {
-  let includeArea = $config.GEO_FENCING_INCLUDE_AREA
-    ? $config.GEO_FENCING_INCLUDE_AREA
-    : AREAS.GLOBAL;
-  let excludeArea = $config.GEO_FENCING_EXCLUDE_AREA
-    ? $config.GEO_FENCING_EXCLUDE_AREA
-    : '';
-
-  try {
-    if (excludeArea) {
-      AgoraRTC.setArea({
-        areaCode: includeArea,
-        excludedArea: excludeArea,
-      });
-    } else {
-      AgoraRTC.setArea({
-        areaCode: includeArea,
-      });
-    }
-  } catch (setAeraError) {
-    console.log('error on setArea', setAeraError);
-  }
+  AgoraRTC.setArea({
+    areaCode: AREAS.GLOBAL,
+    excludedArea: AREAS.CHINA,
+  });
 }
 
 if ($config.LOG_ENABLED) {

package/template/defaultConfig.js

@@ -23,8 +23,6 @@ const DefaultConfig = {
   SLACK_CLIENT_ID: '',
   APPLE_CLIENT_ID: '',
   GEO_FENCING: true,
-  GEO_FENCING_INCLUDE_AREA: 'GLOBAL',
-  GEO_FENCING_EXCLUDE_AREA: '',
   LOG_ENABLED: true,
   EVENT_MODE: false,
   RAISE_HAND: false,

package/template/global.d.ts

@@ -69,8 +69,6 @@ interface ConfigInterface {
   EVENT_MODE: boolean;
   RAISE_HAND: boolean;
   GEO_FENCING: boolean;
-  GEO_FENCING_INCLUDE_AREA: string;
-  GEO_FENCING_EXCLUDE_AREA: string;
   LOG_ENABLED: boolean;
   AUDIO_ROOM: boolean;
   PRIMARY_ACTION_BRAND_COLOR: string;

package/template/ios/Podfile.lock

@@ -361,8 +361,6 @@ PODS:
     - React-Core
   - react-native-document-picker (9.1.1):
     - React-Core
-  - react-native-document-picker (9.1.0):
-    - React-Core
   - react-native-keep-awake (4.0.0):
     - React
   - react-native-webview (13.8.1):
@@ -530,7 +528,7 @@ PODS:
     - React-RCTText
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNShare (7.9.0):
+  - RNShare (10.0.2):
     - React-Core
   - RNSVG (13.6.0):
     - React-Core
@@ -764,8 +762,8 @@ SPEC CHECKSUMS:
   React-jsiexecutor: c7f826e40fa9cab5d37cab6130b1af237332b594
   React-jsinspector: aaed4cf551c4a1c98092436518c2d267b13a673f
   React-logger: da1ebe05ae06eb6db4b162202faeafac4b435e77
-  react-native-agora: 16de7d9657b24dcf1ea6edebb30d06fe3e050c68
-  react-native-document-picker: b4f4a23b73f864ce17965b284c0757648993805b
+  react-native-agora: 0d623411f75a126e6d5f6a41761df9ef74da87e6
+  react-native-document-picker: 3599b238843369026201d2ef466df53f77ae0452
   react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
   react-native-webview: bdc091de8cf7f8397653e30182efcd9f772e03b3
   react-native-whiteboard: d56d2ffa0392b8572bfc613954845e48c6dfd38e
@@ -796,7 +794,7 @@ SPEC CHECKSUMS:
   RNGestureHandler: 62232ba8f562f7dea5ba1b3383494eb5bf97a4d3
   RNInAppBrowser: 48b95ba7a4eaff5cc223bca338d3e319561dbd1b
   RNReanimated: 726395a2fa2f04cea340274ba57a4e659bc0d9c1
-  RNShare: be91a5c149585affb02c25b351bd07ba927c7006
+  RNShare: 859ff710211285676b0bcedd156c12437ea1d564
   RNSVG: 3a79c0c4992213e4f06c08e62730c5e7b9e4dc17
   RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
@@ -804,4 +802,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: be04179eb7bb6b413f3e785e287b050128ebfee6
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2

package/template/package.json

@@ -92,7 +92,7 @@
     "react-native-keyboard-manager": "6.5.4-1",
     "react-native-reanimated": "3.4.2",
     "react-native-responsive-fontsize": "0.5.1",
-    "react-native-share": "7.9.0",
+    "react-native-share": "10.0.2",
     "react-native-svg": "13.6.0",
     "react-native-vector-icons": "9.2.0",
     "react-native-walkthrough-tooltip": "1.4.0",

package/template/src/components/virtual-background/useVB.native.tsx

@@ -45,7 +45,7 @@ type VBContextValue = {
 export const VBContext = React.createContext<VBContextValue>({
   isVBActive: false,
   setIsVBActive: () => {},
-  vbMode: 'none',
+  vbMode: null,
   setVBmode: () => {},
   selectedImage: null,
   setSelectedImage: () => {},
@@ -72,7 +72,7 @@ const downloadBase64Image = async (base64Data, filename) => {
 
 const VBProvider: React.FC = ({children}) => {
   const [isVBActive, setIsVBActive] = React.useState<boolean>(false);
-  const [vbMode, setVBmode] = React.useState<VBMode>('none');
+  const [vbMode, setVBmode] = React.useState<VBMode>(null);
   const [selectedImage, setSelectedImage] = React.useState<
     ImageSourcePropType | string | null
   >(null);
@@ -114,9 +114,9 @@ const VBProvider: React.FC = ({children}) => {
     disable = false,
   ) => {
     if (disable) {
-      await rtc?.RtcEngineUnsafe.enableVirtualBackground(false, config);
+      await rtc?.RtcEngineUnsafe.enableVirtualBackground(false, config, {});
     } else {
-      await rtc?.RtcEngineUnsafe.enableVirtualBackground(true, config);
+      await rtc?.RtcEngineUnsafe.enableVirtualBackground(true, config, {});
     }
   };
 
@@ -133,7 +133,7 @@ const VBProvider: React.FC = ({children}) => {
         disableVB();
         break;
       default:
-        disableVB();
+        break;
     }
   }, [vbMode, selectedImage, saveVB, previewVideoTrack]);
 
@@ -156,7 +156,6 @@ const VBProvider: React.FC = ({children}) => {
     const disableConfig: VirtualBackgroundSource =
       new VirtualBackgroundSource();
     disableConfig.background_source_type = BackgroundSourceType.BackgroundNone;
-
     await applyVirtualBackgroundToMainView(disableConfig, true);
   };
 

package/template/src/pages/VideoCall.tsx

@@ -80,37 +80,6 @@ import {useIsRecordingBot} from '../subComponents/recording/useIsRecordingBot';
 import {videoRoomStartingCallText} from '../language/default-labels/videoCallScreenLabels';
 import {useString} from '../utils/useString';
 
-const NativeAreaCode = {
-  /**
-   * China.
-   */
-  CHINA: 1,
-  /**
-   * Asia, excluding Mainland China.
-   */
-  ASIA: 8,
-  /**
-   * North America.
-   */
-  NORTH_AMERICA: 2,
-  /**
-   * Europe.
-   */
-  EUROPE: 4,
-  /**
-   * Japan.
-   */
-  JAPAN: 16,
-  /**
-   * India.
-   */
-  INDIA: 32,
-  /**
-   * Global.
-   */
-  GLOBAL: -1,
-};
-
 enum RnEncryptionEnum {
   /**
    * @deprecated
@@ -205,21 +174,6 @@ const VideoCall: React.FC = () => {
     clearState,
   } = useContext(SdkApiContext);
 
-  let geoFencingIncludeArea = -1;
-  let geoFencingExcludeArea = 0;
-
-  try {
-    geoFencingIncludeArea = NativeAreaCode[$config.GEO_FENCING_INCLUDE_AREA];
-  } catch (error) {
-    console.log('error on native geoFencingIncludeArea', error);
-  }
-
-  try {
-    geoFencingExcludeArea = NativeAreaCode[$config.GEO_FENCING_EXCLUDE_AREA];
-  } catch (error) {
-    console.log('error on native geoFencingExcludeArea', error);
-  }
-
   // commented for v1 release
   //const lifecycle = useCustomization((data) => data.lifecycle);
   const [rtcProps, setRtcProps] = React.useState({
@@ -237,8 +191,6 @@ const VideoCall: React.FC = () => {
       : false,
     role: ClientRoleType.ClientRoleBroadcaster,
     geoFencing: $config.GEO_FENCING,
-    geoFencingIncludeArea: geoFencingIncludeArea,
-    geoFencingExcludeArea: geoFencingExcludeArea,
     audioRoom: $config.AUDIO_ROOM,
     activeSpeaker: $config.ACTIVE_SPEAKER,
     preferredCameraId:

package/template/src/rtm-events/constants.ts

@@ -2,7 +2,6 @@
 //  1. RECORDING
 const RECORDING_STARTED = 'RECORDING_STARTED';
 const RECORDING_STOPPED = 'RECORDING_STOPPED';
-const RECORDING_STOP_REQUEST = 'RECORDING_STOP_REQUEST';
 // 2. SCREENSHARE
 const SCREENSHARE_STARTED = 'SCREENSHARE_STARTED';
 const SCREENSHARE_STOPPED = 'SCREENSHARE_STOPPED';
@@ -10,7 +9,6 @@ const SCREENSHARE_STOPPED = 'SCREENSHARE_STOPPED';
 const EventActions = {
   RECORDING_STARTED,
   RECORDING_STOPPED,
-  RECORDING_STOP_REQUEST,
   SCREENSHARE_STARTED,
   SCREENSHARE_STOPPED,
 };

package/template/src/subComponents/caption/useTranscriptDownload.native.ts

@@ -33,22 +33,17 @@ const useTranscriptDownload = (): {
           .writeFile(filePath, finalContent, 'utf8')
           .then(() => {
             console.warn('Content downloaded successfully on native.');
-            // display preview of the document and option to share
-            if (isIOS()) {
-              RNFetchBlob.ios.previewDocument(filePath);
-            } else if (isAndroid()) {
-              console.warn('android download complete !');
-              // need to show the preview of downloaded file
-              Share.open({url: `file://${filePath}`, type: 'text/plain'})
-                .then(res => {
-                  console.warn('File shared successfully:', res);
-                  resolve(filePath);
-                })
-                .catch(error => {
-                  console.error('Error sharing file:', error);
-                  reject(error);
-                });
-            }
+            // need to show the preview of downloaded file
+            Share.open({url: `file://${filePath}`, type: 'text/plain'})
+              .then(res => {
+                //  console.warn('File shared successfully:', res);
+                resolve(filePath);
+              })
+              .catch(error => {
+                // console.error('Error sharing file:', error);
+                reject(error);
+              });
+
             resolve(filePath);
           })
           .catch(error => {

package/template/src/subComponents/recording/useRecording.tsx

@@ -185,6 +185,11 @@ const RecordingProvider = (props: RecordingProviderProps) => {
   const startRecording = () => {
     const passphrase = roomId.host || '';
     console.log('web-recording - start recording API called');
+    if (inProgress) {
+      console.log('web-recording - start recording API already in progress');
+      return;
+    }
+    setInProgress(true);
     fetch(`${$config.BACKEND_ENDPOINT}/v1/recording/start`, {
       method: 'POST',
       headers: {
@@ -230,80 +235,61 @@ const RecordingProvider = (props: RecordingProviderProps) => {
 
   const stopRecording = useCallback(() => {
     /**
-     * if condition added for below issue
-     *
-     * user 1 and user 2 in the call
-     * user 1 start the recording
-     * user 2 stops the recording
-     * user 2 join the call getting stop recording notification which is not needed
-     *
-     * solution
-     * case 1 - if recording is not started by the host then we will send level1 message to host who started the recording
-     * case 2 - if person who started the recording no longer available in the call then will stop the recording
+     * Any host in the channel can stop recording.
      */
-    if (
-      localUid === uidWhoStarted ||
-      activeUids.indexOf(uidWhoStarted) === -1
-    ) {
-      setInProgress(true);
-      // If recording is already going on, stop the recording by executing the below query.
-      console.log('web-recording - stop recording API called');
-      fetch(`${$config.BACKEND_ENDPOINT}/v1/recording/stop`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          authorization: store.token ? `Bearer ${store.token}` : '',
-        },
-        body: JSON.stringify({
-          passphrase: roomId.host,
-        }),
-      })
-        .then(res => {
-          setInProgress(false);
-          if (res.status === 200) {
-            /**
-             * 1. Once the backend sucessfuly starts recording, send message
-             * in the channel indicating that cloud recording is now inactive.
-             */
-            events.send(
-              EventNames.RECORDING_ATTRIBUTE,
-              JSON.stringify({
-                action: EventActions.RECORDING_STOPPED,
-                value: '',
-              }),
-              PersistanceLevel.Session,
-            );
-            // 2. set the local recording state to false to update the UI
-            setRecordingActive(false);
-          } else if (res.status === 500) {
-            showErrorToast(headingStopError, subheadingError);
-          } else {
-            showErrorToast(headingStopError);
-          }
-        })
-        .catch(err => {
-          setInProgress(false);
-          console.log(err);
-        });
-    } else {
-      events.send(
-        EventNames.RECORDING_ATTRIBUTE,
-        JSON.stringify({
-          action: EventActions.RECORDING_STOP_REQUEST,
-          value: '',
-        }),
-        PersistanceLevel.None,
+    console.log('web-recording - stop recording API called');
+    if (inProgress) {
+      console.log(
+        'web-recording - stop recording already in progress. Aborting..',
       );
+      return;
     }
+    setInProgress(true);
+    // If recording is already going on, stop the recording by executing the below query.
+    fetch(`${$config.BACKEND_ENDPOINT}/v1/recording/stop`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        authorization: store.token ? `Bearer ${store.token}` : '',
+      },
+      body: JSON.stringify({
+        passphrase: roomId.host,
+      }),
+    })
+      .then(res => {
+        setInProgress(false);
+        if (res.status === 200) {
+          /**
+           * 1. Once the backend sucessfuly stops recording, send message
+           * in the channel indicating that cloud recording is now inactive.
+           */
+          events.send(
+            EventNames.RECORDING_ATTRIBUTE,
+            JSON.stringify({
+              action: EventActions.RECORDING_STOPPED,
+              value: '',
+            }),
+            PersistanceLevel.Session,
+          );
+          // 2. set the local recording state to false to update the UI
+          setRecordingActive(false);
+        } else if (res.status === 500) {
+          showErrorToast(headingStopError, subheadingError);
+        } else {
+          showErrorToast(headingStopError);
+        }
+      })
+      .catch(err => {
+        setInProgress(false);
+        console.log(err);
+      });
   }, [
-    activeUids,
     headingStopError,
-    localUid,
+    inProgress,
     roomId.host,
     setRecordingActive,
     store.token,
     subheadingError,
-    uidWhoStarted,
   ]);
 
   React.useEffect(() => {
@@ -319,9 +305,6 @@ const RecordingProvider = (props: RecordingProviderProps) => {
         case EventActions.RECORDING_STOPPED:
           setRecordingActive(false);
           break;
-        case EventActions.RECORDING_STOP_REQUEST:
-          stopRecording();
-          break;
         default:
           break;
       }
@@ -329,7 +312,7 @@ const RecordingProvider = (props: RecordingProviderProps) => {
     return () => {
       events.off(EventNames.RECORDING_ATTRIBUTE);
     };
-  }, [roomId.host, setRecordingActive, stopRecording]);
+  }, [roomId.host, setRecordingActive]);
 
   return (
     <RecordingContext.Provider