From 300095f50fa532a6fea212351a5406cf4ddf4aca Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Mon, 3 Jun 2019 17:35:15 +0100
Subject: [PATCH] Remove labs flag for custom notif sounds

---
 src/Notifier.js                                      |  4 ++--
 src/components/views/dialogs/RoomSettingsDialog.js   | 12 +++++-------
 .../settings/tabs/room/NotificationSettingsTab.js    |  4 ++--
 src/settings/Settings.js                             |  6 ------
 src/settings/handlers/AccountSettingsHandler.js      |  4 ----
 src/settings/handlers/RoomSettingsHandler.js         |  4 ----
 6 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/Notifier.js b/src/Notifier.js
index 7410fe316a..ef4102ee91 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -103,7 +103,7 @@ const Notifier = {
     getSoundForRoom: async function(roomId) {
         // We do no caching here because the SDK caches setting
         // and the browser will cache the sound.
-        let content = SettingsStore.getValue("notificationSound", roomId);
+        const content = SettingsStore.getValue("notificationSound", roomId);
         if (!content) {
             return null;
         }
@@ -129,7 +129,7 @@ const Notifier = {
     },
 
     _playAudioNotification: async function(ev, room) {
-        const sound = SettingsStore.isFeatureEnabled("feature_notification_sounds") ? await this.getSoundForRoom(room.roomId) : null;
+        const sound = await this.getSoundForRoom(room.roomId);
         console.log(`Got sound ${sound && sound.name || "default"} for ${room.roomId}`);
 
         try {
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index 72ebf316e1..e657a5dbf5 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -70,13 +70,11 @@ export default class RoomSettingsDialog extends React.Component {
             <RolesRoomSettingsTab roomId={this.props.roomId} />,
         ));
 
-        if (SettingsStore.isFeatureEnabled("feature_notification_sounds")) {
-            tabs.push(new Tab(
-                _td("Notifications"),
-                "mx_RoomSettingsDialog_rolesIcon",
-                <NotificationSettingsTab roomId={this.props.roomId} />,
-            ));
-        }
+        tabs.push(new Tab(
+            _td("Notifications"),
+            "mx_RoomSettingsDialog_rolesIcon",
+            <NotificationSettingsTab roomId={this.props.roomId} />,
+        ));
 
         tabs.push(new Tab(
             _td("Advanced"),
diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.js b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
index 6df5b2e469..28c6e7dd5e 100644
--- a/src/components/views/settings/tabs/room/NotificationSettingsTab.js
+++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
@@ -85,7 +85,7 @@ export default class NotificationsSettingsTab extends React.Component {
         if (!this.state.uploadedFile) {
             return;
         }
-        
+
         let type = this.state.uploadedFile.type;
         if (type === "video/ogg") {
             // XXX: I've observed browsers allowing users to pick a audio/ogg files,
@@ -149,7 +149,7 @@ export default class NotificationsSettingsTab extends React.Component {
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
                     <span className='mx_SettingsTab_subheading'>{_t("Sounds")}</span>
                     <div>
-                        <span>{_t("Notification sound")}: <code>{this.state.currentSound}</code></span><br/>
+                        <span>{_t("Notification sound")}: <code>{this.state.currentSound}</code></span><br />
                         <AccessibleButton className="mx_NotificationSound_resetSound" disabled={this.state.currentSound == "default"} onClick={this._clearSound.bind(this)} kind="primary">
                                 {_t("Reset")}
                         </AccessibleButton>
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 6011c5cd43..b284c52d0f 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -126,12 +126,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_notification_sounds": {
-        isFeature: true,
-        displayName: _td("Custom Notification Sounds"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "feature_reactions": {
         isFeature: true,
         displayName: _td("React to messages with emoji (refresh to apply changes)"),
diff --git a/src/settings/handlers/AccountSettingsHandler.js b/src/settings/handlers/AccountSettingsHandler.js
index e34f5b6aae..71cef52c4e 100644
--- a/src/settings/handlers/AccountSettingsHandler.js
+++ b/src/settings/handlers/AccountSettingsHandler.js
@@ -73,10 +73,6 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
             return !content['disable'];
         }
 
-        if (settingName === "notificationSound") {
-            return this._getSettings("uk.half-shot.notification.sound");
-        }
-
         // Special case for breadcrumbs
         if (settingName === "breadcrumb_rooms") {
             const content = this._getSettings(BREADCRUMBS_EVENT_TYPE) || {};
diff --git a/src/settings/handlers/RoomSettingsHandler.js b/src/settings/handlers/RoomSettingsHandler.js
index 470641f9dd..79626e2186 100644
--- a/src/settings/handlers/RoomSettingsHandler.js
+++ b/src/settings/handlers/RoomSettingsHandler.js
@@ -68,10 +68,6 @@ export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandl
             return !content['disable'];
         }
 
-        if (settingName === "notificationSound") {
-            return this._getSettings(roomId, "uk.half-shot.notification.sound");
-        }
-
         const settings = this._getSettings(roomId) || {};
         return settings[settingName];
     }