From b072fdb23f61f9ebd424567025b80d370c371532 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Tue, 20 Sep 2016 12:58:39 -0300
Subject: [PATCH] PLT-4239 fixes getUserMedia (#4038)

---
 webapp/client/webrtc_session.jsx               |  2 +-
 webapp/components/webrtc/webrtc_controller.jsx | 12 ++++++------
 webapp/package.json                            |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapp/client/webrtc_session.jsx b/webapp/client/webrtc_session.jsx
index 1fccddff3f..9ee7fcd5a0 100644
--- a/webapp/client/webrtc_session.jsx
+++ b/webapp/client/webrtc_session.jsx
@@ -21,7 +21,7 @@ export default class WebrtcSession {
         navigator.mediaDevices.getUserMedia(media).
         then((stream) => {
             if (element) {
-                adapter.browserShim.attachMediaStream(element, stream);
+                element.srcObject = stream;
             }
 
             if (callback && typeof callback === 'function') {
diff --git a/webapp/components/webrtc/webrtc_controller.jsx b/webapp/components/webrtc/webrtc_controller.jsx
index f9cf241d5d..968f246389 100644
--- a/webapp/components/webrtc/webrtc_controller.jsx
+++ b/webapp/components/webrtc/webrtc_controller.jsx
@@ -172,10 +172,8 @@ export default class WebrtcController extends React.Component {
                     {
                         audio: true,
                         video: {
-                            mandatory: {
-                                minAspectRatio: MIN_ASPECT,
-                                maxAspectRatio: MAX_ASPECT
-                            },
+                            minAspectRatio: MIN_ASPECT,
+                            maxAspectRatio: MAX_ASPECT,
                             width: VIDEO_WIDTH,
                             height: VIDEO_HEIGHT
                         }
@@ -726,8 +724,10 @@ export default class WebrtcController extends React.Component {
             this.videocall.hangup();
             this.toggleIcons();
 
-            this.localMedia.getVideoTracks()[0].enabled = true;
-            this.localMedia.getAudioTracks()[0].enabled = true;
+            if (this.localMedia) {
+                this.localMedia.getVideoTracks()[0].enabled = true;
+                this.localMedia.getAudioTracks()[0].enabled = true;
+            }
         }
 
         if (error) {
diff --git a/webapp/package.json b/webapp/package.json
index 394cb02f12..f1d07a4757 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -33,7 +33,7 @@
     "superagent": "2.1.0",
     "twemoji": "2.0.5",
     "velocity-animate": "1.2.3",
-    "webrtc-adapter": "1.4.0",
+    "webrtc-adapter": "2.0.3",
     "xregexp": "3.1.1"
   },
   "devDependencies": {