preserve functionality for RTMP URL, use store for StreamBaseURL

jitsi · May 15, 2023 · 38ab95a · 38ab95a
1 parent 8fa36cc
commit 38ab95a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/react/features/recording/components/LiveStream/AbstractStartLiveStreamDialog.ts b/react/features/recording/components/LiveStream/AbstractStartLiveStreamDialog.ts
@@ -222,14 +222,15 @@ export default class AbstractStartLiveStreamDialog<P extends IProps>
         if (!base) {
             return false;
         }
-        if (!key) {
-            return false;
+
+        let rtmpURL = base;
+
+        if (key) {
+            rtmpURL = base.endsWith('/') ? base + key : `${base}/${key}`;
         }
 
-        const rtmpURL = base.endsWith('/') ? base + key : `${base}/${key}`;
         let selectedBroadcastID = null;
 
-        // to modify this too maybe?
         if (selectedBoundStreamID) {
             const selectedBroadcast = broadcasts?.find(
                 broadcast => broadcast.boundStreamID === selectedBoundStreamID);
@@ -239,7 +240,6 @@ export default class AbstractStartLiveStreamDialog<P extends IProps>
 
         sendAnalytics(
             createLiveStreamingDialogEvent('start', 'confirm.button'));
-
         this.props._conference?.startRecording({
             broadcastId: selectedBroadcastID,
             mode: JitsiRecordingConstants.mode.STREAM,

diff --git a/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.tsx b/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.tsx
@@ -11,7 +11,7 @@ import HeaderNavigationButton
     from '../../../../mobile/navigation/components/HeaderNavigationButton';
 import { goBack }
     from '../../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
-import { setLiveStreamKey } from '../../../actions';
+import { setLiveStreamBaseURL, setLiveStreamKey } from '../../../actions';
 import AbstractStartLiveStreamDialog, { IProps, _mapStateToProps } from '../AbstractStartLiveStreamDialog';
 
 import GoogleSigninForm from './GoogleSigninForm';
@@ -34,6 +34,7 @@ class StartLiveStreamDialog extends AbstractStartLiveStreamDialog<IProps> {
 
         // Bind event handlers so they are only bound once per instance.
         this._onStartPress = this._onStartPress.bind(this);
+        this._onStreamBaseURLChange = this._onStreamBaseURLChangeNative.bind(this);
         this._onStreamKeyChangeNative
             = this._onStreamKeyChangeNative.bind(this);
         this._onStreamKeyPick = this._onStreamKeyPick.bind(this);
@@ -83,7 +84,7 @@ class StartLiveStreamDialog extends AbstractStartLiveStreamDialog<IProps> {
                     broadcasts = { this.state.broadcasts }
                     onChange = { this._onStreamKeyPick } />
                 <StreamKeyForm
-                    onStreamBaseURLChange = { this._onStreamBaseURLChange }
+                    onStreamBaseURLChange = { this._onStreamBaseURLChangeNative }
                     onStreamKeyChange = { this._onStreamKeyChangeNative }
                     streamBaseURLValue = { this.state.streamBaseURL || this.props._streamBaseURL || '' }
                     streamKeyValue = { this.state.streamKey || this.props._streamKey || '' } />
@@ -108,6 +109,18 @@ class StartLiveStreamDialog extends AbstractStartLiveStreamDialog<IProps> {
         this._onStreamKeyChange(streamKey);
     }
 
+    /**
+     * Callback to handle stream base URL changes.
+     *
+     * @private
+     * @param {string} streamBaseURL - The new key value.
+     * @returns {void}
+     */
+    _onStreamBaseURLChangeNative(streamBaseURL: string) {
+        this.props.dispatch(setLiveStreamBaseURL(streamBaseURL));
+        this._onStreamBaseURLChange(streamBaseURL);
+    }
+
     /**
      * Callback to be invoked when the user selects a stream from the picker.
      *
@@ -145,12 +158,14 @@ class StartLiveStreamDialog extends AbstractStartLiveStreamDialog<IProps> {
                 .catch(() => {
                     this.setState({
                         broadcasts: undefined,
+                        streamBaseURL: undefined,
                         streamKey: undefined
                     });
                 });
         } else {
             this.setState({
                 broadcasts: undefined,
+                streamBaseURL: undefined,
                 streamKey: undefined
             });
         }