Decouple Audible notifications from Desktop notifications

This commit is contained in:
Michael Telatynski 2020-08-05 11:10:12 +01:00
parent d7229064c4
commit c1e152dba2
3 changed files with 2 additions and 12 deletions

View file

@ -279,7 +279,8 @@ export const Notifier = {
}, },
isAudioEnabled: function() { isAudioEnabled: function() {
return this.isEnabled() && SettingsStore.getValue("audioNotificationsEnabled"); // We don't route Audio via the HTML Notifications API so it is possible regardless of other things
return SettingsStore.getValue("audioNotificationsEnabled");
}, },
setToolbarHidden: function(hidden: boolean, persistent = true) { setToolbarHidden: function(hidden: boolean, persistent = true) {

View file

@ -19,7 +19,6 @@ import { MatrixClient } from 'matrix-js-sdk/src/client';
import { _td } from '../languageHandler'; import { _td } from '../languageHandler';
import { import {
AudioNotificationsEnabledController,
NotificationBodyEnabledController, NotificationBodyEnabledController,
NotificationsEnabledController, NotificationsEnabledController,
} from "./controllers/NotificationControllers"; } from "./controllers/NotificationControllers";
@ -460,7 +459,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
"audioNotificationsEnabled": { "audioNotificationsEnabled": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS, supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
default: true, default: true,
controller: new AudioNotificationsEnabledController(),
}, },
"enableWidgetScreenshots": { "enableWidgetScreenshots": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS, supportedLevels: LEVELS_ACCOUNT_SETTINGS,

View file

@ -79,12 +79,3 @@ export class NotificationBodyEnabledController extends SettingController {
return calculatedValue; return calculatedValue;
} }
} }
export class AudioNotificationsEnabledController extends SettingController {
public getValueOverride(level: SettingLevel, roomId: string, calculatedValue: any): any {
if (!getNotifier().isPossible()) return false;
// Note: Audio notifications are *not* enabled by default.
return calculatedValue;
}
}