Merge remote-tracking branch 'origin/develop' into develop

src/CallMediaHandler.js

@@ -0,0 +1,65 @@
+/*
+ Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+
+ 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 UserSettingsStore from './UserSettingsStore';
+import * as Matrix from 'matrix-js-sdk';
+import q from 'q';
+
+export default {
+    getDevices: function() {
+        // Only needed for Electron atm, though should work in modern browsers
+        // once permission has been granted to the webapp
+        return navigator.mediaDevices.enumerateDevices().then(function(devices) {
+            const audioIn = [];
+            const videoIn = [];
+
+            if (devices.some((device) => !device.label)) return false;
+
+            devices.forEach((device) => {
+                switch (device.kind) {
+                    case 'audioinput': audioIn.push(device); break;
+                    case 'videoinput': videoIn.push(device); break;
+                }
+            });
+
+            // console.log("Loaded WebRTC Devices", mediaDevices);
+            return {
+                audioinput: audioIn,
+                videoinput: videoIn,
+            };
+        }, (error) => { console.log('Unable to refresh WebRTC Devices: ', error); });
+    },
+
+    loadDevices: function() {
+    //     this.getDevices().then((devices) => {
+        const localSettings = UserSettingsStore.getLocalSettings();
+    //         // if deviceId is not found, automatic fallback is in spec
+    //         // recall previously stored inputs if any
+        Matrix.setMatrixCallAudioInput(localSettings['webrtc_audioinput']);
+        Matrix.setMatrixCallVideoInput(localSettings['webrtc_videoinput']);
+        // });
+    },
+
+    setAudioInput: function(deviceId) {
+        UserSettingsStore.setLocalSetting('webrtc_audioinput', deviceId);
+        Matrix.setMatrixCallAudioInput(deviceId);
+    },
+
+    setVideoInput: function(deviceId) {
+        UserSettingsStore.setLocalSetting('webrtc_videoinput', deviceId);
+        Matrix.setMatrixCallVideoInput(deviceId);
+    },
+};

src/components/structures/LoggedInView.js

@@ -22,6 +22,7 @@ import UserSettingsStore from '../../UserSettingsStore';
 import KeyCode from '../../KeyCode';
 import Notifier from '../../Notifier';
 import PageTypes from '../../PageTypes';
+import CallMediaHandler from '../../CallMediaHandler';
 import sdk from '../../index';
 import dis from '../../dispatcher';
 
@@ -79,6 +80,8 @@ export default React.createClass({
         // RoomView.getScrollState()
         this._scrollStateMap = {};
 
+        CallMediaHandler.loadDevices();
+
         document.addEventListener('keydown', this._onKeyDown);
         this._matrixClient.on("accountData", this.onAccountData);
     },

src/components/structures/UserSettings.js

@@ -24,6 +24,7 @@ const dis = require("../../dispatcher");
 const q = require('q');
 const packageJson = require('../../../package.json');
 const UserSettingsStore = require('../../UserSettingsStore');
+const CallMediaHandler = require('../../CallMediaHandler');
 const GeminiScrollbar = require('react-gemini-scrollbar');
 const Email = require('../../email');
 const AddThreepid = require('../../AddThreepid');
@@ -176,6 +177,7 @@ module.exports = React.createClass({
             email_add_pending: false,
             vectorVersion: undefined,
             rejectingInvites: false,
+            mediaDevices: null,
         };
     },
 
@@ -196,6 +198,8 @@ module.exports = React.createClass({
             });
         }
 
+        this._refreshMediaDevices();
+
         // Bulk rejecting invites:
         // /sync won't have had time to return when UserSettings re-renders from state changes, so getRooms()
         // will still return rooms with invites. To get around this, add a listener for
@@ -257,6 +261,20 @@ module.exports = React.createClass({
         this.setState({ electron_settings: settings });
     },
 
+    _refreshMediaDevices: function() {
+        q().then(() => {
+            return CallMediaHandler.getDevices();
+        }).then((mediaDevices) => {
+            // console.log("got mediaDevices", mediaDevices, this._unmounted);
+            if (this._unmounted) return;
+            this.setState({
+                mediaDevices,
+                activeAudioInput: this._localSettings['webrtc_audioinput'],
+                activeVideoInput: this._localSettings['webrtc_videoinput'],
+            });
+        });
+    },
+
     _refreshFromServer: function() {
         const self = this;
         q.all([
@@ -883,6 +901,110 @@ module.exports = React.createClass({
         </div>;
     },
 
+    _mapWebRtcDevicesToSpans: function(devices) {
+        return devices.map((device) => <span key={device.deviceId}>{device.label}</span>);
+    },
+
+    _setAudioInput: function(deviceId) {
+        this.setState({activeAudioInput: deviceId});
+        CallMediaHandler.setAudioInput(deviceId);
+    },
+
+    _setVideoInput: function(deviceId) {
+        this.setState({activeVideoInput: deviceId});
+        CallMediaHandler.setVideoInput(deviceId);
+    },
+
+    _requestMediaPermissions: function(event) {
+        const getUserMedia = (
+            window.navigator.getUserMedia || window.navigator.webkitGetUserMedia || window.navigator.mozGetUserMedia
+        );
+        if (getUserMedia) {
+            return getUserMedia.apply(window.navigator, [
+                { video: true, audio: true },
+                this._refreshMediaDevices,
+                function() {
+                    const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
+                    Modal.createDialog(ErrorDialog, {
+                        title: _t('No media permissions'),
+                        description: _t('You may need to manually permit Riot to access your microphone/webcam'),
+                    });
+                },
+            ]);
+        }
+    },
+
+    _renderWebRtcSettings: function() {
+        if (this.state.mediaDevices === false) {
+            return <div>
+                <h3>{_t('VoIP')}</h3>
+                <div className="mx_UserSettings_section">
+                    <p className="mx_UserSettings_link" onClick={this._requestMediaPermissions}>
+                        {_t('Missing Media Permissions, click here to request.')}
+                    </p>
+                </div>
+            </div>;
+        } else if (!this.state.mediaDevices) return;
+
+        const Dropdown = sdk.getComponent('elements.Dropdown');
+
+        let microphoneDropdown = <p>{_t('No Microphones detected')}</p>;
+        let webcamDropdown = <p>{_t('No Webcams detected')}</p>;
+
+        const defaultOption = {
+            deviceId: '',
+            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>
+                <Dropdown
+                    className="mx_UserSettings_webRtcDevices_dropdown"
+                    value={this.state.activeAudioInput || defaultInput}
+                    onOptionChange={this._setAudioInput}>
+                    {this._mapWebRtcDevicesToSpans(audioInputs)}
+                </Dropdown>
+            </div>;
+        }
+
+        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>
+                <Dropdown
+                    className="mx_UserSettings_webRtcDevices_dropdown"
+                    value={this.state.activeVideoInput || defaultInput}
+                    onOptionChange={this._setVideoInput}>
+                    {this._mapWebRtcDevicesToSpans(videoInputs)}
+                </Dropdown>
+            </div>;
+        }
+
+        return <div>
+            <h3>{_t('VoIP')}</h3>
+            <div className="mx_UserSettings_section">
+                {microphoneDropdown}
+                {webcamDropdown}
+            </div>
+        </div>;
+    },
+
     _showSpoiler: function(event) {
         const target = event.target;
         target.innerHTML = target.getAttribute('data-spoiler');
@@ -1080,6 +1202,7 @@ module.exports = React.createClass({
 
                 {this._renderUserInterfaceSettings()}
                 {this._renderLabs()}
+                {this._renderWebRtcSettings()}
                 {this._renderDevicesPanel()}
                 {this._renderCryptoInfo()}
                 {this._renderBulkOptions()}

src/components/views/login/PasswordLogin.js

@@ -182,7 +182,7 @@ class PasswordLogin extends React.Component {
             <div>
                 <form onSubmit={this.onSubmitForm}>
                 <div className="mx_Login_type_container">
-                    <label className="mx_Login_type_label">{ _t('I want to sign in with') }</label>
+                    <label className="mx_Login_type_label">{ _t('Sign in with') }</label>
                     <Dropdown
                         className="mx_Login_type_dropdown"
                         value={this.state.loginType}

src/components/views/login/ServerConfig.js

@@ -132,7 +132,7 @@ module.exports = React.createClass({
         var toggleButton;
         if (this.props.withToggleButton) {
             toggleButton = (
-                <div style={{ textAlign: 'center' }}>
+                <div className="mx_ServerConfig_selector">
                     <input className="mx_Login_radio" id="basic" name="configVisible" type="radio"
                         checked={!this.state.configVisible}
                         onChange={this.onServerConfigVisibleChange.bind(this, false)} />

src/i18n/strings/de_DE.json

@@ -139,7 +139,7 @@
     "Invite new room members": "Lade neue Raum-Mitglieder ein",
     "is a": "ist ein",
     "is trusted": "wird vertraut",
-    "I want to sign in with": "Ich möchte mich anmelden mit",
+    "Sign in with": "Ich möchte mich anmelden mit",
     "joined and left": "trat bei und ging",
     "joined": "trat bei",
     "joined the room": "trat dem Raum bei",

src/i18n/strings/en_EN.json

@@ -129,6 +129,15 @@
   "Add email address": "Add email address",
   "Add phone number": "Add phone number",
   "Admin": "Admin",
+  "VoIP": "VoIP",
+  "Missing Media Permissions, click here to request.": "Missing Media Permissions, click here to request.",
+  "No Microphones detected": "No Microphones detected",
+  "No Webcams detected": "No Webcams detected",
+  "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",
+  "Camera": "Camera",
   "Advanced": "Advanced",
   "Algorithm": "Algorithm",
   "Always show message timestamps": "Always show message timestamps",
@@ -318,7 +327,7 @@
   "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
   "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
   "%(displayName)s is typing": "%(displayName)s is typing",
-  "I want to sign in with": "I want to sign in with",
+  "Sign in with": "Sign in with",
   "Join Room": "Join Room",
   "joined and left": "joined and left",
   "joined": "joined",

src/i18n/strings/es.json

@@ -308,7 +308,7 @@
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' no es un formato válido para una dirección",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' no es un formato válido para un alias",
     "%(displayName)s is typing": "%(displayName)s esta escribiendo",
-    "I want to sign in with": "Quiero iniciar sesión con",
+    "Sign in with": "Quiero iniciar sesión con",
     "Join Room": "Unirte a la sala",
     "joined and left": "unido y dejado",
     "joined": "unido",

src/i18n/strings/fr.json

@@ -318,7 +318,7 @@
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' n'est pas un format valide pour une adresse",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' n'est pas un format valide pour un alias",
     "%(displayName)s is typing": "%(displayName)s est en train de taper",
-    "I want to sign in with": "Je veux m'identifier avec",
+    "Sign in with": "Je veux m'identifier avec",
     "Join Room": "Rejoindre le salon",
     "joined and left": "a joint et quitté",
     "joined": "a joint",

src/i18n/strings/pt.json

@@ -112,7 +112,7 @@
     "Invites": "Convidar",
     "Invites user with given id to current room": "Convidar usuários com um dado identificador para esta sala",
     "is a": "é um(a)",
-    "I want to sign in with": "Quero entrar",
+    "Sign in with": "Quero entrar",
     "joined and left": "entrou e saiu",
     "joined": "entrou",
     "joined the room": "entrou na sala",

src/i18n/strings/pt_BR.json

@@ -115,7 +115,7 @@
     "Invites": "Convidar",
     "Invites user with given id to current room": "Convidar usuários com um dado identificador para esta sala",
     "is a": "é um(a)",
-    "I want to sign in with": "Quero entrar",
+    "Sign in with": "Quero entrar",
     "joined and left": "entrou e saiu",
     "joined": "entrou",
     "joined the room": "entrou na sala",

src/i18n/strings/ru.json

@@ -103,7 +103,7 @@
     "Invites": "Приглашать",
     "Invites user with given id to current room": "Пригласить пользователя с данным id в текущую комнату",
     "is a": "является",
-    "I want to sign in with": "Я хочу регистрироваться с",
+    "Sign in with": "Я хочу регистрироваться с",
     "joined and left": "присоединенный и оставленный",
     "joined": "присоединенный",
     "joined the room": "joined the room",