Merge pull request #1211 from maraoz/support/old-backups

Add copay version to saved settings

js/app.js

@@ -1,10 +1,12 @@
 'use strict';
 
+var copay = require('copay');
 var config = defaultConfig;
 var localConfig = JSON.parse(localStorage.getItem('config'));
-
 if (localConfig) {
-  var count = 0;
+  var cmv = copay.version.split('.')[1];
+  var lmv = localConfig.version ? localConfig.version.split('.')[1] : '-1';
+  if (cmv === lmv) {
     for (name in localConfig) {
       if (localConfig.hasOwnProperty(name)) {
         if (name === 'networkName' && config['forceNetwork']) {
@@ -13,14 +15,13 @@ if (localConfig) {
         config[name] = localConfig[name];
       }
     }
+  }
 }
 
 var log = function() {
   if (config.verbose) console.log(arguments);
 }
 
-// From the bundle
-var copay = require('copay');
 
 var copayApp = window.copayApp = angular.module('copayApp', [
   'ngRoute',

js/controllers/settings.js

@@ -8,10 +8,6 @@ angular.module('copayApp.controllers').controller('SettingsController', function
   $scope.insightHost = config.blockchain.host;
   $scope.insightPort = config.blockchain.port;
   $scope.insightSecure = config.blockchain.schema === 'https';
-  $scope.networkKey = config.network.key;
-  $scope.networkHost = config.network.host;
-  $scope.networkPort = config.network.port;
-  $scope.networkSecure = config.network.secure || false;
   $scope.disableVideo = typeof config.disableVideo === undefined ? true : config.disableVideo;
   $scope.forceNetwork = config.forceNetwork;
 
@@ -72,6 +68,7 @@ angular.module('copayApp.controllers').controller('SettingsController', function
       disableVideo: $scope.disableVideo,
       unitName: $scope.selectedUnit.shortName,
       unitToSatoshi: $scope.selectedUnit.value,
+      version: copay.version,
     }));
 
     // Go home reloading the application

js/models/network/Async.js

@@ -9,19 +9,6 @@ var extend = nodeUtil._extend;
 var io = require('socket.io-client');
 var preconditions = require('preconditions').singleton();
 
-/*
- * Emits
- *  'connect'
- *    when network layout has change (new/lost peers, etc)
- *
- *  'data'
- *    when an unknown data type arrives
- *
- * Provides
- *  send(toPeerIds, {data}, cb?)
- *
- */
-
 function Network(opts) {
   var self = this;
   opts = opts || {};