Merge pull request #24 from MirrorFly/release_sdk/V2.3.4

release sdk version 2.3.4

Author: Vanithacontus

.gitignore

@@ -89,3 +89,6 @@ mirrorfly-uikit-react-native-*.tgz
 !.yarn/versions
 
 patches/react-native-network-logger+1.16.1.patch
+
+# Ignore lock files
+**/*.lock

package.json

@@ -47,7 +47,7 @@
       "jest": "^29.6.3",
       "lodash-es": "^4.17.21",
       "luxon": "^3.5.0",
-      "mirrorfly-reactnative-sdk": "^2.3.0",
+      "mirrorfly-reactnative-sdk": "^2.3.4",
       "moment": "^2.30.1",
       "patch-package": "^8.0.0",
       "prettier": "2.8.8",

patches/react-native-contacts+8.0.4.patch

@@ -242,6 +242,22 @@ const updateCallAgainScreenData = (userID, callType) => {
    Store.dispatch(setCallModalScreen(CALL_AGAIN_SCREEN));
 };
 
+export const disconnectCall = async () => {
+   setpreventMultipleClick(false);
+   clearOutgoingTimer();
+   SDK.endCall();
+   stopOutgoingCallRingingTone();
+   if (Platform.OS === 'android') {
+      await stopForegroundServiceNotification();
+   }
+   dispatchDisconnected();
+   clearIosCallListeners();
+   endCallForIos();
+   resetCallData();
+   closeCallModalActivity(true);
+};
+
+
 export const endCall = async (isFromTimeout = false, userId = '', callType = '') => {
    setpreventMultipleClick(false);
    const { data: confrenceData = {} } = Store.getState().showConfrenceData || {};
@@ -500,7 +516,7 @@ export const selectLargeVideoUser = (userJid, volumelevel) => {
          if (!volumeLevelsBasedOnUserJid[userJid]) {
             volumeLevelsBasedOnUserJid[userJid] = 0.5;
          }
-         volumeLevelsInDBBasedOnUserJid[userJid] = volumelevel ? volumelevel : 0;
+         volumeLevelsInDBBasedOnUserJid[userJid] = volumelevel || 0;
          if (Object.keys(volumeLevelsInDBBasedOnUserJid).length > 1) {
             let largest = Object.values(volumeLevelsInDBBasedOnUserJid)[0];
             userJid = Object.keys(volumeLevelsInDBBasedOnUserJid)[0];
@@ -622,7 +638,7 @@ function getFromJidFromRemoteStream(remoteStream) {
 
 export const switchCallData = (callType, res) => {
    const callerUUID = Store.getState().callData.callerUUID || {};
-   const isSpeakerEnabled = callType === CALL_TYPE_VIDEO ? true : false;
+   const isSpeakerEnabled = callType === CALL_TYPE_VIDEO;
    enableSpeaker(callerUUID, isSpeakerEnabled);
    if (Platform.OS === 'android') {
       stopForegroundServiceNotification().then(() => {

src/Helper/Calls/Call.js

@@ -12,6 +12,7 @@ import commonStyles from '../styles/commonStyles';
 import RNSlider from './RNSlider';
 import style from './styles';
 import { useFocusEffect } from '@react-navigation/native';
+import PropTypes from 'prop-types';
 
 const PLAY_STATE_PAUSED = 'paused';
 const PLAY_STATE_PLAYING = 'playing';
@@ -22,6 +23,15 @@ export const pauseAudio = () => {
    soundRef?.current?.updateState?.();
 };
 
+const propTypes = {
+   mediaStatus: PropTypes.string,
+   uri: PropTypes.string,
+   msgId: PropTypes.string,
+   media: PropTypes.shape({
+      duration: PropTypes.number, // Ensures media.duration is a number
+   }),
+};
+
 const AudioPlayer = props => {
    const { media, msgId, uri, mediaStatus } = props;
    const [playState, setPlayState] = React.useState(PLAY_STATE_PAUSED);
@@ -41,12 +51,7 @@ const AudioPlayer = props => {
 
    React.useEffect(() => {
       let timeout = setInterval(() => {
-         if (
-            sound.current &&
-            sound?.current?.isLoaded() &&
-            playStateRef.current === PLAY_STATE_PLAYING &&
-            !sliderEditing.current
-         ) {
+         if (sound?.current?.isLoaded() && playStateRef.current === PLAY_STATE_PLAYING && !sliderEditing.current) { //NOSONAR
             sound.current.getCurrentTime(seconds => {
                setPlaySeconds(seconds);
             });
@@ -72,40 +77,49 @@ const AudioPlayer = props => {
    }, [appState]);
 
    React.useEffect(() => {
-      if (sound.current && playState === PLAY_STATE_PLAYING) {
-         if (soundRef.current && soundRef.current.msgId !== msgId) {
-            soundRef.current.pause();
-            soundRef?.current?.updateState?.();
-         }
+      const initializeSound = filepath => {
+         Sound.setCategory('Playback');
+         sound.current = new Sound(filepath, '', error => {
+            if (error) {
+               console.log(error, 'Play Error');
+               setPlayState(PLAY_STATE_PAUSED);
+            } else {
+               handleSoundLoaded();
+            }
+         });
+      };
+
+      const handleSoundLoaded = () => {
+         setPlayState(PLAY_STATE_PLAYING);
+         playStateRef.current = PLAY_STATE_PLAYING;
+         setTimeout(() => {
+            configureSoundRef();
+            sound.current.setCurrentTime(playSeconds);
+            sound.current.play(playComplete);
+         });
+      };
+
+      const configureSoundRef = () => {
          soundRef.current = sound.current;
          soundRef.current.msgId = msgId;
          soundRef.current.updateState = () => {
             setPlayState(PLAY_STATE_PAUSED);
          };
-         sound.current.play(playComplete);
-      } else {
-         const filepath = uri;
-         if (playState === PLAY_STATE_LOADING && filepath) {
-            Sound.setCategory('Playback');
-            sound.current = new Sound(filepath, '', error => {
-               if (error) {
-                  console.log(error, 'Play Error');
-                  setPlayState(PLAY_STATE_PAUSED);
-               } else {
-                  setPlayState(PLAY_STATE_PLAYING);
-                  playStateRef.current = PLAY_STATE_PLAYING;
-                  setTimeout(() => {
-                     soundRef.current = sound.current;
-                     soundRef.current.msgId = msgId;
-                     soundRef.current.updateState = () => {
-                        setPlayState(PLAY_STATE_PAUSED);
-                     };
-                     sound.current.setCurrentTime(playSeconds);
-                     sound.current.play(playComplete);
-                  });
-               }
-            });
+      };
+
+      const handlePlayStatePlaying = () => {
+         if (soundRef.current && soundRef.current.msgId !== msgId) {
+            soundRef.current.pause();
+            soundRef?.current?.updateState?.();
          }
+         configureSoundRef();
+         sound.current.play(playComplete);
+      };
+
+      if (sound.current && playState === PLAY_STATE_PLAYING) {
+         handlePlayStatePlaying();
+      } else if (playState === PLAY_STATE_LOADING && uri) {
+         initializeSound(uri);
       }
    }, [playState]);
 
@@ -144,12 +158,22 @@ const AudioPlayer = props => {
       setPlayState(PLAY_STATE_PAUSED);
    };
 
-   const getAudioTimeString = seconds => {
-      let h = Math.floor(seconds / 3600);
-      let m = Math.floor((seconds % 3600) / 60);
-      let s = Math.floor(seconds % 60);
+   const getAudioTimeString = totalSeconds => {
+      let h = Math.floor(totalSeconds / 3600);
+      let m = Math.floor((totalSeconds % 3600) / 60);
+      let s = Math.floor(totalSeconds % 60);
+
+      let hours = '';
+      if (h > 0) {
+         hours = h < 10 ? `0${h}` : h;
+         hours += ':';
+      }
+      let minutes = m < 10 ? `0${m}` : m;
+      let seconds = s < 10 ? `0${s}` : s;
+
+      minutes += ':';
 
-      return (h > 0 ? (h < 10 ? `0${h}` : h) + ':' : '') + (m < 10 ? `0${m}` : m) + ':' + (s < 10 ? `0${s}` : s);
+      return hours + minutes + seconds;
    };
 
    const playComplete = success => {
@@ -215,4 +239,6 @@ const AudioPlayer = props => {
    );
 };
 
+AudioPlayer.propTypes = propTypes;
+
 export default AudioPlayer;

src/Media/AudioPlayer.js

@@ -171,7 +171,7 @@ export default class Slider extends PureComponent {
       value: new Animated.Value(this.props.value),
    };
 
-   componentWillMount() {
+   componentWillMount() { // NOSONAR
       this._panResponder = PanResponder.create({
          onStartShouldSetPanResponder: this._handleStartShouldSetPanResponder,
          onMoveShouldSetPanResponder: this._handleMoveShouldSetPanResponder,
@@ -183,7 +183,7 @@ export default class Slider extends PureComponent {
       });
    }
 
-   componentWillReceiveProps(nextProps) {
+   componentWillReceiveProps(nextProps) { // NOSONAR
       const newValue = nextProps.value;
 
       if (this.props.value !== newValue) {
@@ -400,9 +400,11 @@ export default class Slider extends PureComponent {
 
    _setCurrentValueAnimated = value => {
       const animationType = this.props.animationType;
-      const animationConfig = Object.assign({}, DEFAULT_ANIMATION_CONFIGS[animationType], this.props.animationConfig, {
+      const animationConfig = {
+         ...DEFAULT_ANIMATION_CONFIGS[animationType],
+         ...this.props.animationConfig,
          toValue: value,
-      });
+      };
 
       Animated[animationType](this.state.value, animationConfig).start();
    };
@@ -430,7 +432,7 @@ export default class Slider extends PureComponent {
       const { width, height } = this._getTouchOverflowSize();
 
       const touchOverflowStyle = {};
-      if (width !== undefined && height !== undefined) {
+      if (width !== undefined && height !== undefined) { //NOSONAR
          const verticalMargin = -height / 2;
          touchOverflowStyle.marginTop = verticalMargin;
          touchOverflowStyle.marginBottom = verticalMargin;
@@ -482,6 +484,14 @@ export default class Slider extends PureComponent {
    };
 }
 
+Slider.propTypes = {
+   ...Slider.propTypes,
+   styles: PropTypes.object,
+   style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+   trackStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+   thumbStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+};
+
 const defaultStyles = StyleSheet.create({
    container: {
       height: 40,

src/Media/ImageZoom.js

@@ -8,6 +8,7 @@ import { useAppState } from '../common/hooks';
 import { showToast } from '../helpers/chatHelpers';
 import commonStyles from '../styles/commonStyles';
 import MediaControls, { PLAYER_STATES } from './media-controls';
+import { sdkLog } from '../SDK/utils';
 
 const VideoPlayer = () => {
    const {
@@ -145,6 +146,7 @@ const VideoPlayer = () => {
    };
 
    const onError = error => {
+      sdkLog('VIDEO_PLAY_BACK_ERROR', error);
       showToast(error?.error?.errorException);
       handlePause();
       setIsLoading(false);
@@ -174,7 +176,6 @@ const VideoPlayer = () => {
                paused={paused}
                controls={false}
                poster={videoUri}
-               posterResizeMode={'contain'}
                ref={videoPlayer}
                resizeMode={'contain'}
                source={{ uri: videoUri }}

src/Media/RNSlider.js

@@ -12,7 +12,6 @@ export type Props = {
    duration: number;
    fadeOutDisable?: boolean;
    fadeOutDelay?: number;
-   isFullScreen: boolean;
    isLoading: boolean;
    primaryColor: string;
    onFullScreen?: (event: GestureResponderEvent) => void;

src/Media/VideoPlayer.js

@@ -1,4 +1,5 @@
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import PropTypes from 'prop-types';
 import React from 'react';
 import { Provider } from 'react-redux';
 import VideoPlayer from '../Media/VideoPlayer';
@@ -113,6 +114,10 @@ export function ChatScreen({ chatUser }) {
    );
 }
 
+ChatScreen.propTypes = {
+   chatUser: PropTypes.string,
+};
+
 export const ProfileStack = () => {
    return (
       <Provider store={store}>