conflicts fixed

Author: naman9271

JitsiConference.ts

@@ -835,33 +835,6 @@ export default class JitsiConference extends Listenable {
         }));
     }
 
-    /**
-     * Restarts all active media sessions.
-     *
-     * @returns {void}
-     * @internal
-     */
-    _restartMediaSessions(): void {
-        if (this.p2pJingleSession) {
-            this._stopP2PSession({
-                reasonDescription: 'restart',
-                requestRestart: true
-            });
-        }
-
-        if (this.jvbJingleSession) {
-            this._stopJvbSession({
-                reason: 'success',
-                reasonDescription: 'restart required',
-                requestRestart: true,
-                sendSessionTerminate: true
-            });
-        }
-
-        this._maybeStartOrStopP2P(false);
-    }
-
-
     /**
    * Fires TRACK_AUDIO_LEVEL_CHANGED change conference event (for local tracks).
    * @param {number} audioLevel - The audio level.
@@ -2428,6 +2401,32 @@ export default class JitsiConference extends Listenable {
         return process;
     }
 
+    /**
+     * Restarts all active media sessions.
+     *
+     * @returns {void}
+     * @internal
+     */
+    _restartMediaSessions(): void {
+        if (this.p2pJingleSession) {
+            this._stopP2PSession({
+                reasonDescription: 'restart',
+                requestRestart: true
+            });
+        }
+
+        if (this.jvbJingleSession) {
+            this._stopJvbSession({
+                reason: 'success',
+                reasonDescription: 'restart required',
+                requestRestart: true,
+                sendSessionTerminate: true
+            });
+        }
+
+        this._maybeStartOrStopP2P(false);
+    }
+
     /**
    * Check if joined to the conference.
    * @returns {boolean} True if joined, false otherwise.

globals.d.ts

@@ -16,6 +16,12 @@ declare global {
             writable: WritableStream<RTCEncodedAudioFrame | RTCEncodedVideoFrame>;
         }
     }
+    interface RTCRtpSender {
+        createEncodedStreams?: () => {
+            readable: ReadableStream<RTCEncodedAudioFrame | RTCEncodedVideoFrame>;
+            writable: WritableStream<RTCEncodedAudioFrame | RTCEncodedVideoFrame>;
+        }
+    }
     interface MediaStream {
         oninactive?: ((this: MediaStream, ev: Event) => void) | ((this: MediaStreamTrack, ev: Event) => void) | null;
     }

modules/e2ee/KeyHandler.ts

@@ -1,8 +1,8 @@
 import { getLogger } from '@jitsi/logger';
 
+import JitsiConference from '../../JitsiConference';
 import { JitsiConferenceEvents } from '../../JitsiConferenceEvents';
 import { RTCEvents } from '../../service/RTC/RTCEvents';
-import JitsiConference from '../../JitsiConference';
 import JitsiLocalTrack from '../RTC/JitsiLocalTrack';
 import JitsiRemoteTrack from '../RTC/JitsiRemoteTrack';
 import TraceablePeerConnection from '../RTC/TraceablePeerConnection';

modules/e2ee/ManagedKeyHandler.ts

@@ -1,8 +1,8 @@
 import { getLogger } from '@jitsi/logger';
 import { debounce } from 'lodash-es';
 
-import { JitsiConferenceEvents } from '../../JitsiConferenceEvents';
 import JitsiConference from '../../JitsiConference';
+import { JitsiConferenceEvents } from '../../JitsiConferenceEvents';
 import JitsiParticipant from '../../JitsiParticipant';
 
 import { KeyHandler } from './KeyHandler';