From 1d45e0fc5d388aef44efaf72843343b3fa2065d1 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 27 Jun 2014 16:44:33 -0300
Subject: [PATCH] defaults to SSL server of peerjs

---
 config.js                  | 6 +++---
 index.html                 | 4 ++--
 js/controllers/settings.js | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config.js b/config.js
index f65af3ff4..8a7edd1dd 100644
--- a/config.js
+++ b/config.js
@@ -26,10 +26,10 @@ var defaultConfig = {
 
     // Use this to connect to bitpay's PeerJS server
     key: 'satoshirocks',
-    host: '162.242.219.26',
-    port: 10000,
+    host: 'copay.io',
+    port: 9000,
     path: '/',
-    secure: false,
+    secure: true,
 
     // other PeerJS config
     maxPeers: 15,
diff --git a/index.html b/index.html
index da3b31613..e82c0473f 100644
--- a/index.html
+++ b/index.html
@@ -871,8 +871,8 @@
                 <input type="text" ng-model="networkHost" class="form-control" name="peerjs-host">
                 <label for="peerjs-port">Port</label>
                 <input type="number" ng-model="networkPort" class="form-control" name="peerjs-port">
-                <input id="peerjs-secure" type="checkbox" ng-model="networkSecure" class="form-control" disabled="disabled">
-                <label for="peerjs-secure">Use SSL (disabled)</label>
+                <input id="peerjs-secure" type="checkbox" ng-model="networkSecure" class="form-control">
+                <label for="peerjs-secure">Use SSL</label>
             </fieldset>
           </div>
           <div class="row">
diff --git a/js/controllers/settings.js b/js/controllers/settings.js
index f4de5e36f..b38252d5d 100644
--- a/js/controllers/settings.js
+++ b/js/controllers/settings.js
@@ -11,7 +11,7 @@ angular.module('copayApp.controllers').controller('SettingsController',
     $scope.networkHost = config.network.host;
     $scope.networkPort = config.network.port;
     $scope.networkSecure = config.network.secure || false;
-    $scope.disableVideo = config.disableVideo || true;
+    $scope.disableVideo = typeof config.disableVideo === undefined ?  true : config.disableVideo;
 
     $scope.unitOpts = [{
       name: 'Satoshis (100,000,000 satoshis = 1BTC)',
@@ -39,12 +39,12 @@ angular.module('copayApp.controllers').controller('SettingsController',
     }
 
     $scope.changeNetwork = function() {
-      $scope.insightHost = $scope.networkName === 'testnet' ? 'test-insight.bitpay.com' : 'insight.bitpay.com';
+      $scope.insightHost = $scope.networkName !== 'testnet' ? 'test-insight.bitpay.com' : 'insight.bitpay.com';
     };
 
 
     $scope.changeInsightSSL = function() {
-      $scope.insightPort = $scope.insightSecure ? 443 : 80;
+      $scope.insightPort = $scope.insightSecure ? 80 : 443;
     };