Stop broadcasts on logout (#9978)
Co-authored-by: Andy Balaam <andy.balaam@matrix.org>
This commit is contained in:
@@ -134,7 +134,7 @@ import { ValidatedServerConfig } from "../../utils/ValidatedServerConfig";
|
||||
import { isLocalRoom } from "../../utils/localRoom/isLocalRoom";
|
||||
import { SdkContextClass, SDKContext } from "../../contexts/SDKContext";
|
||||
import { viewUserDeviceSettings } from "../../actions/handlers/viewUserDeviceSettings";
|
||||
import { VoiceBroadcastResumer } from "../../voice-broadcast";
|
||||
import { cleanUpBroadcasts, VoiceBroadcastResumer } from "../../voice-broadcast";
|
||||
import GenericToast from "../views/toasts/GenericToast";
|
||||
import { Linkify } from "../views/elements/Linkify";
|
||||
import RovingSpotlightDialog, { Filter } from "../views/dialogs/spotlight/SpotlightDialog";
|
||||
@@ -591,9 +591,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
|
||||
break;
|
||||
case "logout":
|
||||
LegacyCallHandler.instance.hangupAllCalls();
|
||||
Promise.all([...CallStore.instance.activeCalls].map((call) => call.disconnect())).finally(() =>
|
||||
Lifecycle.logout(),
|
||||
);
|
||||
Promise.all([
|
||||
...[...CallStore.instance.activeCalls].map((call) => call.disconnect()),
|
||||
cleanUpBroadcasts(this.stores),
|
||||
]).finally(() => Lifecycle.logout());
|
||||
break;
|
||||
case "require_registration":
|
||||
startAnyRegistrationFlow(payload as any);
|
||||
|
||||
@@ -46,6 +46,7 @@ export * from "./stores/VoiceBroadcastPlaybacksStore";
|
||||
export * from "./stores/VoiceBroadcastPreRecordingStore";
|
||||
export * from "./stores/VoiceBroadcastRecordingsStore";
|
||||
export * from "./utils/checkVoiceBroadcastPreConditions";
|
||||
export * from "./utils/cleanUpBroadcasts";
|
||||
export * from "./utils/doClearCurrentVoiceBroadcastPlaybackIfStopped";
|
||||
export * from "./utils/doMaybeSetCurrentVoiceBroadcastPlayback";
|
||||
export * from "./utils/getChunkLength";
|
||||
|
||||
28
src/voice-broadcast/utils/cleanUpBroadcasts.ts
Normal file
28
src/voice-broadcast/utils/cleanUpBroadcasts.ts
Normal file
@@ -0,0 +1,28 @@
|
||||
/*
|
||||
Copyright 2023 The Matrix.org Foundation C.I.C.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
import { SdkContextClass } from "../../contexts/SDKContext";
|
||||
|
||||
export const cleanUpBroadcasts = async (stores: SdkContextClass): Promise<void> => {
|
||||
stores.voiceBroadcastPlaybacksStore.getCurrent()?.stop();
|
||||
stores.voiceBroadcastPlaybacksStore.clearCurrent();
|
||||
|
||||
await stores.voiceBroadcastRecordingsStore.getCurrent()?.stop();
|
||||
stores.voiceBroadcastRecordingsStore.clearCurrent();
|
||||
|
||||
stores.voiceBroadcastPreRecordingStore.getCurrent()?.cancel();
|
||||
stores.voiceBroadcastPreRecordingStore.clearCurrent();
|
||||
};
|
||||
Reference in New Issue
Block a user