From 0bafd6458a0a6a06b8d9f14dff097cffc75e297e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 2 Jun 2017 00:26:31 +0100
Subject: [PATCH] Revert voodoo

---
 src/CallMediaHandler.js                   | 24 -----------------------
 src/components/structures/UserSettings.js | 16 ++++++++++-----
 src/i18n/strings/en_EN.json               |  2 --
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/src/CallMediaHandler.js b/src/CallMediaHandler.js
index d5813c1d5c..45ca5dc30d 100644
--- a/src/CallMediaHandler.js
+++ b/src/CallMediaHandler.js
@@ -53,36 +53,12 @@ export default {
         // });
     },
 
-    _findDefault: function(devices) {
-        return devices.some((device) => device.deviceId === 'default') ? 'default' : undefined;
-    },
-
-    setAudioInputDefault: async function() {
-        const devices = await this.getDevices();
-        const audioDefault = this._findDefault(devices.audioinput);
-        this._setAudioInput(audioDefault);
-    },
-
     setAudioInput: function(deviceId) {
-        this[deviceId === 'default' ? 'setAudioInputDefault' : '_setAudioInput'](deviceId);
-    },
-
-    _setAudioInput: function(deviceId) {
         UserSettingsStore.setLocalSetting('webrtc_audioinput', deviceId);
         Matrix.setMatrixCallAudioInput(deviceId);
     },
 
-    setVideoInputDefault: async function() {
-        const devices = await this.getDevices();
-        const videoDefault = this._findDefault(devices.videoinput);
-        this._setVideoInput(videoDefault);
-    },
-
     setVideoInput: function(deviceId) {
-        this[deviceId === 'default' ? 'setVideoInputDefault' : '_setVideoInput'](deviceId);
-    },
-
-    _setVideoInput: function(deviceId) {
         UserSettingsStore.setLocalSetting('webrtc_videoinput', deviceId);
         Matrix.setMatrixCallVideoInput(deviceId);
     },
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 99b02b59f9..b8567fc180 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -952,21 +952,24 @@ module.exports = React.createClass({
         let webcamDropdown = <p>{_t('No Webcams detected')}</p>;
 
         const defaultOption = {
-            deviceId: 'default',
+            deviceId: undefined,
             label: _t('Default Device'),
         };
 
         const audioInputs = this.state.mediaDevices.audioinput.slice(0);
         if (audioInputs.length > 0) {
+            let defaultInput;
             if (!audioInputs.some((input) => input.deviceId === 'default')) {
                 audioInputs.unshift(defaultOption);
+            } else {
+                defaultInput = 'default';
             }
 
             microphoneDropdown = <div>
-                <h4>{_t('Microphone')}</h4>
+                <h4>Microphone</h4>
                 <Dropdown
                     className="mx_UserSettings_webRtcDevices_dropdown"
-                    value={this.state.activeAudioInput || 'default'}
+                    value={this.state.activeAudioInput || defaultInput}
                     onOptionChange={this._setAudioInput}>
                     {this._mapWebRtcDevicesToSpans(audioInputs)}
                 </Dropdown>
@@ -975,15 +978,18 @@ module.exports = React.createClass({
 
         const videoInputs = this.state.mediaDevices.videoinput.slice(0);
         if (videoInputs.length > 0) {
+            let defaultInput;
             if (!videoInputs.some((input) => input.deviceId === 'default')) {
                 videoInputs.unshift(defaultOption);
+            } else {
+                defaultInput = 'default';
             }
 
             webcamDropdown = <div>
-                <h4>{_t('Camera')}</h4>
+                <h4>Cameras</h4>
                 <Dropdown
                     className="mx_UserSettings_webRtcDevices_dropdown"
-                    value={this.state.activeVideoInput || 'default'}
+                    value={this.state.activeVideoInput || defaultInput}
                     onOptionChange={this._setVideoInput}>
                     {this._mapWebRtcDevicesToSpans(videoInputs)}
                 </Dropdown>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b9ac79d362..3a8752fd5d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -136,8 +136,6 @@
   "No media permissions": "No media permissions",
   "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
   "Default Device": "Default Device",
-  "Microphone": "Microphone",
-  "Cameras": "Cameras",
   "Advanced": "Advanced",
   "Algorithm": "Algorithm",
   "Always show message timestamps": "Always show message timestamps",