From 0c738e5334cd9eac5540ee8de0abb1d6b9f5a63a Mon Sep 17 00:00:00 2001
From: Philipp Hancke <fippo@andyet.net>
Date: Mon, 21 Apr 2014 18:15:27 +0200
Subject: [PATCH] get camera on demand, accept calls on cam accept

---
 clientapp/app.js                       |  4 ----
 clientapp/helpers/xmppEventHandlers.js | 11 ++++++++---
 package.json                           |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/clientapp/app.js b/clientapp/app.js
index 396c5ab..f825f62 100644
--- a/clientapp/app.js
+++ b/clientapp/app.js
@@ -67,10 +67,6 @@ module.exports = {
                 client.use(pushNotifications);
                 xmppEventHandlers(self.api, self);
 
-                if (self.api.jingle.capabilities.length > 1) {
-                    self.api.jingle.startLocalMedia();
-                }
-
                 self.api.once('session:started', function () {
                     app.state.hasConnected = true;
                     cb();
diff --git a/clientapp/helpers/xmppEventHandlers.js b/clientapp/helpers/xmppEventHandlers.js
index 3c6be47..6deed5c 100644
--- a/clientapp/helpers/xmppEventHandlers.js
+++ b/clientapp/helpers/xmppEventHandlers.js
@@ -409,7 +409,13 @@ module.exports = function (client, app) {
             state: 'incoming',
             jingleSession: session
         });
-        session.accept();
+        if (!client.jingle.localStream) {
+            client.jingle.startLocalMedia(null, function (err) {
+                session.accept();
+            });
+        } else {
+            session.accept();
+        }
         contact.jingleCall = call;
         me.calls.add(call);
     });
@@ -449,11 +455,10 @@ module.exports = function (client, app) {
     client.on('jingle:remotestream:added', function (session) {
         var contact = me.getContact(session.peer);
         if (!contact) {
-            contact = new Contact({jid: client.JID(session.peer).bare});
             contact.resources.add({id: session.peer});
             me.contacts.add(contact);
         }
-        contact.stream = session.stream;
+        contact.stream = session.streams[0];
     });
 
     client.on('jingle:remotestream:removed', function (session) {
diff --git a/package.json b/package.json
index 06a0ec4..39f1f4a 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "oembed": "0.1.0",
     "semi-static": "0.0.4",
     "sound-effect-manager": "0.0.5",
-    "stanza.io": "3.2.4",
+    "stanza.io": "3.6.x",
     "staydown": "1.0.3",
     "templatizer": "0.1.2",
     "underscore": "1.5.1",