From b3c59e2cb018364320a2762912c9d5e1ef90d541 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Wed, 23 Dec 2015 14:17:24 -0300
Subject: [PATCH 01/18] add switch to enable/disable notifications on global
 setings

---
 public/views/preferencesGlobal.html     |  4 ++++
 src/js/controllers/index.js             |  5 +++++
 src/js/controllers/preferencesGlobal.js | 18 ++++++++++++++++--
 src/js/services/configService.js        |  6 +++++-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/public/views/preferencesGlobal.html b/public/views/preferencesGlobal.html
index 2fd500373..54155c4c3 100644
--- a/public/views/preferencesGlobal.html
+++ b/public/views/preferencesGlobal.html
@@ -48,6 +48,10 @@
       <switch id="spend-unconfirmed" name="spendUnconfirmed" ng-model="spendUnconfirmed" class="green right"></switch>
       <div translate>Use Unconfirmed Funds</div>
     </li>
+    <li>
+      <switch id="enable-notifications" name="notifications" ng-model="notifications" class="green right"></switch>
+      <div translate>Enable notifications</div>
+    </li>
   </ul>
   <h4></h4>
   <ul class="no-bullet m0 ">
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index dfb408a65..e79055aba 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1197,6 +1197,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     self.updateAll();
   });
 
+  $rootScope.$on('Local/EnableNotifications', function(event, vale) {
+    //make suscribe/unsuscribe
+    self.updateAll();
+  });
+
   $rootScope.$on('Local/FeeLevelUpdated', function(event, level) {
     self.setCurrentFeeLevel(level);
   });
diff --git a/src/js/controllers/preferencesGlobal.js b/src/js/controllers/preferencesGlobal.js
index 741d37963..17095c002 100644
--- a/src/js/controllers/preferencesGlobal.js
+++ b/src/js/controllers/preferencesGlobal.js
@@ -2,7 +2,7 @@
 
 angular.module('copayApp.controllers').controller('preferencesGlobalController',
   function($scope, $rootScope, $log, configService, uxLanguage) {
-    
+
     this.init = function() {
       var config = configService.getSync();
       this.unitName = config.wallet.settings.unitName;
@@ -10,10 +10,11 @@ angular.module('copayApp.controllers').controller('preferencesGlobalController',
       this.selectedAlternative = {
         name: config.wallet.settings.alternativeName,
         isoCode: config.wallet.settings.alternativeIsoCode
-      }; 
+      };
       $scope.spendUnconfirmed = config.wallet.spendUnconfirmed;
       $scope.glideraEnabled = config.glidera.enabled;
       $scope.glideraTestnet = config.glidera.testnet;
+      $scope.notifications = config.notifications ? config.notifications.enabled : true;
     };
 
     var unwatchSpendUnconfirmed = $scope.$watch('spendUnconfirmed', function(newVal, oldVal) {
@@ -29,6 +30,19 @@ angular.module('copayApp.controllers').controller('preferencesGlobalController',
       });
     });
 
+    var unwatchNotification = $scope.$watch('notifications', function(newVal, oldVal) {
+      if (newVal == oldVal) return;
+      var opts = {
+        notifications: {
+          enabled: newVal
+        }
+      };
+      configService.set(opts, function(err) {
+        $rootScope.$emit('Local/EnableNotifications', opts);
+        if (err) $log.debug(err);
+      });
+    });
+
     var unwatchGlideraEnabled = $scope.$watch('glideraEnabled', function(newVal, oldVal) {
       if (newVal == oldVal) return;
       var opts = {
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 9f391237b..3771c5e9b 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -41,6 +41,10 @@ angular.module('copayApp.services').factory('configService', function(storageSer
     rates: {
       url: 'https://insight.bitpay.com:443/api/rates',
     },
+
+    notifications: {
+      enabled: true
+    },
   };
 
   var configCache = null;
@@ -70,7 +74,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
           configCache.wallet.settings.unitCode = defaultConfig.wallet.settings.unitCode;
         }
         if (!configCache.glidera) {
-          configCache.glidera = defaultConfig.glidera; 
+          configCache.glidera = defaultConfig.glidera;
         }
 
       } else {

From fdc03a6f295bb240578a504d2501f762bdc8c650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 23 Dec 2015 12:29:46 -0300
Subject: [PATCH 02/18] push notifications

---
 cordova/build.sh                            |  6 +++
 src/js/controllers/index.js                 | 48 ++++++++++++++++++++-
 src/js/services/pushNotificationsService.js | 14 ++++++
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 src/js/services/pushNotificationsService.js

diff --git a/cordova/build.sh b/cordova/build.sh
index 40d6916d4..c4be3d920 100755
--- a/cordova/build.sh
+++ b/cordova/build.sh
@@ -106,6 +106,12 @@ if [ ! -d $PROJECT ]; then
   cordova plugin add cordova-plugin-customurlscheme --variable URL_SCHEME=bitcoin
   checkOK
 
+  cordova plugin add phonegap-plugin-push@1.2.3
+  checkOK
+
+  cordova plugin add https://github.com/EddyVerbruggen/LaunchMyApp-PhoneGap-Plugin.git --variable URL_SCHEME=bitcoin
+  checkOK
+
   cordova plugin add cordova-plugin-inappbrowser
   checkOK
 
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index e79055aba..c6047c022 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, txFormatService, uxLanguage, $state, glideraService, isMobile, addressbookService) {
+angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, pushNotificationsService, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, txFormatService, uxLanguage, $state, glideraService, isMobile, addressbookService) {
   var self = this;
   var SOFT_CONFIRMATION_LIMIT = 12;
   self.isCordova = isCordova;
@@ -11,6 +11,52 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   self.updatingTxHistory = {};
   self.prevState = 'walletHome';
 
+  document.addEventListener('deviceready', function() {
+
+    var push = PushNotification.init({
+      android: {
+        senderID: "959259672122"
+      },
+      ios: {
+        alert: "true",
+        badge: true,
+        sound: 'false'
+      },
+      windows: {}
+    });
+
+    push.on('registration', function(data) {
+      var opts = {};
+      opts.user = "Gabriel";
+      opts.type = "android";
+      opts.token = data.registrationId;
+      pushNotificationsService.subscribe(opts).then(function(response) {
+          console.log(response);
+        },
+        function(err) {
+          console.log(err);
+        });
+    });
+
+    push.on('notification', function(data) {
+      console.log("notification event");
+      alert(data.message);
+
+      // data.message,
+      // data.title,
+      // data.count,
+      // data.sound,
+      // data.image,
+      // data.additionalData
+    });
+
+    push.on('error', function(e) {
+      console.log("error pushhhhhh");
+      alert(e.message);
+    });
+
+  });
+
   function strip(number) {
     return (parseFloat(number.toPrecision(12)));
   };
diff --git a/src/js/services/pushNotificationsService.js b/src/js/services/pushNotificationsService.js
new file mode 100644
index 000000000..78e186650
--- /dev/null
+++ b/src/js/services/pushNotificationsService.js
@@ -0,0 +1,14 @@
+ 'use strict';
+ angular.module('copayApp.services')
+   .factory('pushNotificationsService', function($http) {
+     var root = {};
+
+     //"APA91bHCysW7fzE_ks5HPOu2BGr0G7T-aD5SPfzaSGIKuhp82gFUcopVPPck8EfnxgHyK_3QJ9FdFS8H2mjAILDv3jdrH6slJzmCwoszya9XdJz4Uv-cxkLDYXb7z086TD3uPgSLnMUO"
+
+     root.subscribe = function(opts) {
+       return $http.post('http://192.168.1.120:8000/subscribe', opts);
+     }
+
+     return root;
+
+   });

From a05d4a0cff1e795b45b7840289c8e5aa9e177932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 23 Dec 2015 12:35:47 -0300
Subject: [PATCH 03/18] refactor

---
 src/js/services/pushNotificationsService.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/js/services/pushNotificationsService.js b/src/js/services/pushNotificationsService.js
index 78e186650..3aed74598 100644
--- a/src/js/services/pushNotificationsService.js
+++ b/src/js/services/pushNotificationsService.js
@@ -3,8 +3,6 @@
    .factory('pushNotificationsService', function($http) {
      var root = {};
 
-     //"APA91bHCysW7fzE_ks5HPOu2BGr0G7T-aD5SPfzaSGIKuhp82gFUcopVPPck8EfnxgHyK_3QJ9FdFS8H2mjAILDv3jdrH6slJzmCwoszya9XdJz4Uv-cxkLDYXb7z086TD3uPgSLnMUO"
-
      root.subscribe = function(opts) {
        return $http.post('http://192.168.1.120:8000/subscribe', opts);
      }

From d02afef341547ec4c686bb90f628924cda9a824c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 23 Dec 2015 15:33:56 -0300
Subject: [PATCH 04/18] addapt switch to suscribe/unsuscribe notifications

---
 src/js/controllers/index.js                 | 81 +++++++++++++--------
 src/js/services/pushNotificationsService.js |  6 ++
 src/js/services/storageService.js           |  8 ++
 3 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index c6047c022..b048052db 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -13,46 +13,49 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
   document.addEventListener('deviceready', function() {
 
-    var push = PushNotification.init({
-      android: {
-        senderID: "959259672122"
-      },
-      ios: {
-        alert: "true",
-        badge: true,
-        sound: 'false'
-      },
-      windows: {}
-    });
+    if (isCordova) {
+      var push = PushNotification.init({
+        android: {
+          senderID: "959259672122"
+        },
+        ios: {
+          alert: "true",
+          badge: true,
+          sound: 'false'
+        },
+        windows: {}
+      });
+    }
 
     push.on('registration', function(data) {
       var opts = {};
       opts.user = "Gabriel";
       opts.type = "android";
       opts.token = data.registrationId;
-      pushNotificationsService.subscribe(opts).then(function(response) {
-          console.log(response);
-        },
-        function(err) {
-          console.log(err);
-        });
+      storageService.setNotificationsOptions(JSON.stringify(opts), function() {
+        pushNotificationsService.subscribe(opts).then(function(response) {
+            $log.debug('Suscribed: ' + response.status);
+          },
+          function(err) {
+            $log.warn('Error: ' + err);
+          });
+      });
+
     });
 
     push.on('notification', function(data) {
-      console.log("notification event");
-      alert(data.message);
-
-      // data.message,
-      // data.title,
-      // data.count,
-      // data.sound,
-      // data.image,
-      // data.additionalData
+      $log.debug('Notification event: ', data.message);
+      /* data.message,
+       data.title,
+       data.count,
+       data.sound,
+       data.image,
+       data.additionalData
+      */
     });
 
     push.on('error', function(e) {
-      console.log("error pushhhhhh");
-      alert(e.message);
+      $log.warn('Error trying to push notifications: ', e);
     });
 
   });
@@ -1243,9 +1246,25 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     self.updateAll();
   });
 
-  $rootScope.$on('Local/EnableNotifications', function(event, vale) {
-    //make suscribe/unsuscribe
-    self.updateAll();
+  $rootScope.$on('Local/EnableNotifications', function(event, val) {
+    storageService.getNotificationsOptions(function(err, opts) {
+      if (val.notifications.enabled) {
+        pushNotificationsService.subscribe(opts).then(function(response) {
+            $log.debug('Suscribed: ' + response.status);
+          },
+          function(err) {
+            $log.warn('Error: ' + err);
+          });
+      } else {
+        pushNotificationsService.unsubscribe(JSON.parse(opts).token).then(function(response) {
+            $log.debug('Unsuscribed: ' + response.status);
+          },
+          function(err) {
+            $log.warn('Error: ' + err);
+          });
+      }
+      self.updateAll();
+    });
   });
 
   $rootScope.$on('Local/FeeLevelUpdated', function(event, level) {
diff --git a/src/js/services/pushNotificationsService.js b/src/js/services/pushNotificationsService.js
index 3aed74598..73076c312 100644
--- a/src/js/services/pushNotificationsService.js
+++ b/src/js/services/pushNotificationsService.js
@@ -7,6 +7,12 @@
        return $http.post('http://192.168.1.120:8000/subscribe', opts);
      }
 
+     root.unsubscribe = function(token) {
+       return $http.post('http://192.168.1.120:8000/unsubscribe', {
+         token: token
+       });
+     }
+
      return root;
 
    });
diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js
index 3d00f82a9..175e06b52 100644
--- a/src/js/services/storageService.js
+++ b/src/js/services/storageService.js
@@ -231,6 +231,14 @@ angular.module('copayApp.services')
       storage.get('addressbook-' + network, cb);
     };
 
+    root.setNotificationsOptions = function(opts, cb) {
+      storage.set('notifications', opts, cb);
+    }
+
+    root.getNotificationsOptions = function(cb) {
+      storage.get('notifications', cb);
+    }
+
     root.removeAddressbook = function(network, cb) {
       storage.remove('addressbook-' + network, cb);
     };

From ca65303941d66f6ea1ddcec4166370e3ba092589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 23 Dec 2015 16:44:20 -0300
Subject: [PATCH 05/18] adding subscribe opts

---
 src/js/controllers/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index b048052db..5b9e6a0ba 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -29,8 +29,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
     push.on('registration', function(data) {
       var opts = {};
-      opts.user = "Gabriel";
-      opts.type = "android";
+      var deviceType = (navigator.userAgent.match(/iPhone/i)) == "iPhone" ? "ios" : (navigator.userAgent.match(/Android/i)) == "Android" ? "android" : null;
+      opts.user = "copayUser";
+      opts.type = deviceType;
       opts.token = data.registrationId;
       storageService.setNotificationsOptions(JSON.stringify(opts), function() {
         pushNotificationsService.subscribe(opts).then(function(response) {

From 012fb8021b6018266bb4c1230b3da02998d471c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 28 Dec 2015 12:32:01 -0300
Subject: [PATCH 06/18] adding copayersid and walletid to user subscribe json

---
 public/views/preferencesGlobal.html         | 2 +-
 src/js/controllers/index.js                 | 3 ++-
 src/js/controllers/preferencesGlobal.js     | 5 ++++-
 src/js/services/pushNotificationsService.js | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/public/views/preferencesGlobal.html b/public/views/preferencesGlobal.html
index 54155c4c3..a2994f6c2 100644
--- a/public/views/preferencesGlobal.html
+++ b/public/views/preferencesGlobal.html
@@ -48,7 +48,7 @@
       <switch id="spend-unconfirmed" name="spendUnconfirmed" ng-model="spendUnconfirmed" class="green right"></switch>
       <div translate>Use Unconfirmed Funds</div>
     </li>
-    <li>
+    <li ng-show="mobile">
       <switch id="enable-notifications" name="notifications" ng-model="notifications" class="green right"></switch>
       <div translate>Enable notifications</div>
     </li>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 5b9e6a0ba..032a3f663 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -28,9 +28,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     }
 
     push.on('registration', function(data) {
+      var fc = profileService.focusedClient;
       var opts = {};
       var deviceType = (navigator.userAgent.match(/iPhone/i)) == "iPhone" ? "ios" : (navigator.userAgent.match(/Android/i)) == "Android" ? "android" : null;
-      opts.user = "copayUser";
+      opts.user = fc.credentials.copayerId + "||" + fc.credentials.walletId;
       opts.type = deviceType;
       opts.token = data.registrationId;
       storageService.setNotificationsOptions(JSON.stringify(opts), function() {
diff --git a/src/js/controllers/preferencesGlobal.js b/src/js/controllers/preferencesGlobal.js
index 17095c002..bfb90ddb5 100644
--- a/src/js/controllers/preferencesGlobal.js
+++ b/src/js/controllers/preferencesGlobal.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesGlobalController',
-  function($scope, $rootScope, $log, configService, uxLanguage) {
+  function($scope, $rootScope, $log, configService, uxLanguage, isCordova) {
 
     this.init = function() {
       var config = configService.getSync();
@@ -17,6 +17,9 @@ angular.module('copayApp.controllers').controller('preferencesGlobalController',
       $scope.notifications = config.notifications ? config.notifications.enabled : true;
     };
 
+    if (isCordova) $scope.mobile = true;
+    else $scope.mobile = false;
+
     var unwatchSpendUnconfirmed = $scope.$watch('spendUnconfirmed', function(newVal, oldVal) {
       if (newVal == oldVal) return;
       var opts = {
diff --git a/src/js/services/pushNotificationsService.js b/src/js/services/pushNotificationsService.js
index 73076c312..31e41486a 100644
--- a/src/js/services/pushNotificationsService.js
+++ b/src/js/services/pushNotificationsService.js
@@ -4,11 +4,11 @@
      var root = {};
 
      root.subscribe = function(opts) {
-       return $http.post('http://192.168.1.120:8000/subscribe', opts);
+       return $http.post('http://192.168.1.126:8000/subscribe', opts);
      }
 
      root.unsubscribe = function(token) {
-       return $http.post('http://192.168.1.120:8000/unsubscribe', {
+       return $http.post('http://192.168.1.126:8000/unsubscribe', {
          token: token
        });
      }

From 2d07cf0e55c7bffbfa1efc82635d553e25d24a6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 4 Jan 2016 08:55:28 -0300
Subject: [PATCH 07/18] push notification subscribe refactor

---
 src/js/controllers/index.js             | 51 +++++++++++++++----------
 src/js/controllers/preferencesGlobal.js |  2 +-
 src/js/services/profileService.js       | 20 +++++-----
 src/js/services/storageService.js       |  8 ++--
 4 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 032a3f663..b2326d67a 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -13,28 +13,35 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
   document.addEventListener('deviceready', function() {
 
-    if (isCordova) {
-      var push = PushNotification.init({
-        android: {
-          senderID: "959259672122"
-        },
-        ios: {
-          alert: "true",
-          badge: true,
-          sound: 'false'
-        },
-        windows: {}
+    if (self.isCordova) {
+      storageService.getDeviceToken(function(err, token) {
+        if (!token) pushNotificationInit();
       });
     }
 
+  });
+
+  function pushNotificationInit() {
+    var push = PushNotification.init({
+      android: {
+        senderID: "959259672122"
+      },
+      ios: {
+        alert: "true",
+        badge: true,
+        sound: 'false'
+      },
+      windows: {}
+    });
+
     push.on('registration', function(data) {
       var fc = profileService.focusedClient;
       var opts = {};
-      var deviceType = (navigator.userAgent.match(/iPhone/i)) == "iPhone" ? "ios" : (navigator.userAgent.match(/Android/i)) == "Android" ? "android" : null;
-      opts.user = fc.credentials.copayerId + "||" + fc.credentials.walletId;
-      opts.type = deviceType;
+      opts.user = fc.credentials.walletId;
+      opts.type = (navigator.userAgent.match(/iPhone/i)) == "iPhone" ? "ios" : (navigator.userAgent.match(/Android/i)) == "Android" ? "android" : null;
       opts.token = data.registrationId;
-      storageService.setNotificationsOptions(JSON.stringify(opts), function() {
+
+      storageService.setDeviceToken(data.registrationId, function() {
         pushNotificationsService.subscribe(opts).then(function(response) {
             $log.debug('Suscribed: ' + response.status);
           },
@@ -59,8 +66,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     push.on('error', function(e) {
       $log.warn('Error trying to push notifications: ', e);
     });
-
-  });
+  }
 
   function strip(number) {
     return (parseFloat(number.toPrecision(12)));
@@ -1249,8 +1255,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   });
 
   $rootScope.$on('Local/EnableNotifications', function(event, val) {
-    storageService.getNotificationsOptions(function(err, opts) {
-      if (val.notifications.enabled) {
+    storageService.getDeviceToken(function(err, token) {
+      var fc = profileService.focusedClient;
+      var opts = {};
+      opts.user = [fc.credentials.walletId];
+      opts.type = (navigator.userAgent.match(/iPhone/i)) == "iPhone" ? "ios" : (navigator.userAgent.match(/Android/i)) == "Android" ? "android" : null;
+      opts.token = token;
+      if (val) {
         pushNotificationsService.subscribe(opts).then(function(response) {
             $log.debug('Suscribed: ' + response.status);
           },
@@ -1258,7 +1269,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
             $log.warn('Error: ' + err);
           });
       } else {
-        pushNotificationsService.unsubscribe(JSON.parse(opts).token).then(function(response) {
+        pushNotificationsService.unsubscribe(token).then(function(response) {
             $log.debug('Unsuscribed: ' + response.status);
           },
           function(err) {
diff --git a/src/js/controllers/preferencesGlobal.js b/src/js/controllers/preferencesGlobal.js
index bfb90ddb5..e04f935a5 100644
--- a/src/js/controllers/preferencesGlobal.js
+++ b/src/js/controllers/preferencesGlobal.js
@@ -41,7 +41,7 @@ angular.module('copayApp.controllers').controller('preferencesGlobalController',
         }
       };
       configService.set(opts, function(err) {
-        $rootScope.$emit('Local/EnableNotifications', opts);
+        $rootScope.$emit('Local/EnableNotifications', opts.notifications.enabled);
         if (err) $log.debug(err);
       });
     });
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 8c4a284eb..e10db0d49 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -118,7 +118,7 @@ angular.module('copayApp.services')
 
     root.bindProfile = function(profile, cb) {
       root.profile = profile;
-      
+
       configService.get(function(err) {
         $log.debug('Preferences read');
         if (err) return cb(err);
@@ -128,20 +128,19 @@ angular.module('copayApp.services')
           root._setFocus(focusedWalletId, function() {
             $rootScope.$emit('Local/ProfileBound');
             root.isDisclaimerAccepted(function(val) {
-              if (!val) { 
+              if (!val) {
                 return cb(new Error('NONAGREEDDISCLAIMER: Non agreed disclaimer'));
-              }
-              else {
+              } else {
                 return cb();
               }
             });
           });
         });
       });
-        
+
     };
 
-    root.loadAndBindProfile = function(cb) { 
+    root.loadAndBindProfile = function(cb) {
       storageService.getProfile(function(err, profile) {
         if (err) {
           $rootScope.$emit('Local/DeviceError', err);
@@ -398,6 +397,7 @@ angular.module('copayApp.services')
         handleImport(function() {
           root.setAndStoreFocus(walletId, function() {
             storageService.storeProfile(root.profile, function(err) {
+              $rootScope.$emit('Local/EnableNotifications', true);
               return cb(err, walletId);
             });
           });
@@ -542,16 +542,14 @@ angular.module('copayApp.services')
                 if (err) $log.error(err);
                 return cb(true);
               });
-            }
-            else {
+            } else {
               return cb();
             }
           });
-        }
-        else {
+        } else {
           return cb();
         }
-      });   
+      });
     };
 
     root.importLegacyWallet = function(username, password, blob, cb) {
diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js
index 175e06b52..940a4943d 100644
--- a/src/js/services/storageService.js
+++ b/src/js/services/storageService.js
@@ -231,12 +231,12 @@ angular.module('copayApp.services')
       storage.get('addressbook-' + network, cb);
     };
 
-    root.setNotificationsOptions = function(opts, cb) {
-      storage.set('notifications', opts, cb);
+    root.setDeviceToken = function(token, cb) {
+      storage.set('token', token, cb);
     }
 
-    root.getNotificationsOptions = function(cb) {
-      storage.get('notifications', cb);
+    root.getDeviceToken = function(cb) {
+      storage.get('token', cb);
     }
 
     root.removeAddressbook = function(network, cb) {

From 171665afe6c03ed5400959f8dd243350afaa4adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 4 Jan 2016 14:11:24 -0300
Subject: [PATCH 08/18] refactor

---
 src/js/controllers/index.js                 | 83 ++----------------
 src/js/controllers/preferencesGlobal.js     |  7 +-
 src/js/services/profileService.js           |  2 +-
 src/js/services/pushNotificationsService.js | 94 ++++++++++++++++++---
 4 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index b2326d67a..ac39c4dc2 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -12,62 +12,15 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   self.prevState = 'walletHome';
 
   document.addEventListener('deviceready', function() {
-
     if (self.isCordova) {
       storageService.getDeviceToken(function(err, token) {
-        if (!token) pushNotificationInit();
+        $timeout(function() {
+          if (!token) pushNotificationsService.pushNotificationsInit();
+        }, 5000);
       });
     }
-
   });
 
-  function pushNotificationInit() {
-    var push = PushNotification.init({
-      android: {
-        senderID: "959259672122"
-      },
-      ios: {
-        alert: "true",
-        badge: true,
-        sound: 'false'
-      },
-      windows: {}
-    });
-
-    push.on('registration', function(data) {
-      var fc = profileService.focusedClient;
-      var opts = {};
-      opts.user = fc.credentials.walletId;
-      opts.type = (navigator.userAgent.match(/iPhone/i)) == "iPhone" ? "ios" : (navigator.userAgent.match(/Android/i)) == "Android" ? "android" : null;
-      opts.token = data.registrationId;
-
-      storageService.setDeviceToken(data.registrationId, function() {
-        pushNotificationsService.subscribe(opts).then(function(response) {
-            $log.debug('Suscribed: ' + response.status);
-          },
-          function(err) {
-            $log.warn('Error: ' + err);
-          });
-      });
-
-    });
-
-    push.on('notification', function(data) {
-      $log.debug('Notification event: ', data.message);
-      /* data.message,
-       data.title,
-       data.count,
-       data.sound,
-       data.image,
-       data.additionalData
-      */
-    });
-
-    push.on('error', function(e) {
-      $log.warn('Error trying to push notifications: ', e);
-    });
-  }
-
   function strip(number) {
     return (parseFloat(number.toPrecision(12)));
   };
@@ -1254,32 +1207,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     self.updateAll();
   });
 
-  $rootScope.$on('Local/EnableNotifications', function(event, val) {
-    storageService.getDeviceToken(function(err, token) {
-      var fc = profileService.focusedClient;
-      var opts = {};
-      opts.user = [fc.credentials.walletId];
-      opts.type = (navigator.userAgent.match(/iPhone/i)) == "iPhone" ? "ios" : (navigator.userAgent.match(/Android/i)) == "Android" ? "android" : null;
-      opts.token = token;
-      if (val) {
-        pushNotificationsService.subscribe(opts).then(function(response) {
-            $log.debug('Suscribed: ' + response.status);
-          },
-          function(err) {
-            $log.warn('Error: ' + err);
-          });
-      } else {
-        pushNotificationsService.unsubscribe(token).then(function(response) {
-            $log.debug('Unsuscribed: ' + response.status);
-          },
-          function(err) {
-            $log.warn('Error: ' + err);
-          });
-      }
-      self.updateAll();
-    });
-  });
-
   $rootScope.$on('Local/FeeLevelUpdated', function(event, level) {
     self.setCurrentFeeLevel(level);
   });
@@ -1346,6 +1273,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     go.walletHome();
   });
 
+  $rootScope.$on('Local/EnableNotifications', function(event) {
+    pushNotificationsService.enableNotifications();
+  });
+
   self.debouncedUpdate = lodash.throttle(function() {
     self.updateAll({
       quiet: true
diff --git a/src/js/controllers/preferencesGlobal.js b/src/js/controllers/preferencesGlobal.js
index e04f935a5..ab468733f 100644
--- a/src/js/controllers/preferencesGlobal.js
+++ b/src/js/controllers/preferencesGlobal.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesGlobalController',
-  function($scope, $rootScope, $log, configService, uxLanguage, isCordova) {
+  function($scope, $rootScope, $log, configService, uxLanguage, isCordova, pushNotificationsService) {
 
     this.init = function() {
       var config = configService.getSync();
@@ -41,7 +41,10 @@ angular.module('copayApp.controllers').controller('preferencesGlobalController',
         }
       };
       configService.set(opts, function(err) {
-        $rootScope.$emit('Local/EnableNotifications', opts.notifications.enabled);
+        if (opts.notifications.enabled)
+          pushNotificationsService.enableNotifications();
+        else
+          pushNotificationsService.disableNotifications();
         if (err) $log.debug(err);
       });
     });
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index e10db0d49..9f50e9260 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -397,7 +397,7 @@ angular.module('copayApp.services')
         handleImport(function() {
           root.setAndStoreFocus(walletId, function() {
             storageService.storeProfile(root.profile, function(err) {
-              $rootScope.$emit('Local/EnableNotifications', true);
+              $rootScope.$emit('Local/EnableNotifications');
               return cb(err, walletId);
             });
           });
diff --git a/src/js/services/pushNotificationsService.js b/src/js/services/pushNotificationsService.js
index 31e41486a..ea0f20d11 100644
--- a/src/js/services/pushNotificationsService.js
+++ b/src/js/services/pushNotificationsService.js
@@ -1,18 +1,84 @@
- 'use strict';
- angular.module('copayApp.services')
-   .factory('pushNotificationsService', function($http) {
-     var root = {};
+'use strict';
+angular.module('copayApp.services')
+  .factory('pushNotificationsService', function($http, $log, profileService, storageService, lodash) {
+    var root = {};
 
-     root.subscribe = function(opts) {
-       return $http.post('http://192.168.1.126:8000/subscribe', opts);
-     }
+    root.pushNotificationsInit = function() {
 
-     root.unsubscribe = function(token) {
-       return $http.post('http://192.168.1.126:8000/unsubscribe', {
-         token: token
-       });
-     }
+      var push = PushNotification.init({
+        android: {
+          senderID: "959259672122"
+        },
+        ios: {
+          alert: "true",
+          badge: true,
+          sound: 'false'
+        },
+        windows: {}
+      });
 
-     return root;
+      push.on('registration', function(data) {
+        storageService.setDeviceToken(data.registrationId, function() {
+          root.enableNotifications();
+        });
+      });
 
-   });
+      push.on('notification', function(data) {
+        $log.debug('Notification event: ', data.message);
+        /* data.message,
+         data.title,
+         data.count,
+         data.sound,
+         data.image,
+         data.additionalData
+        */
+      });
+
+      push.on('error', function(e) {
+        $log.warn('Error trying to push notifications: ', e);
+      });
+    };
+
+    root.enableNotifications = function() {
+      storageService.getDeviceToken(function(err, token) {
+
+        lodash.forEach(profileService.getWallets('livenet'), function(wallets) {
+          var opts = {};
+          opts.user = wallets.id;
+          opts.type = (navigator.userAgent.match(/iPhone/i)) == "iPhone" ? "ios" : (navigator.userAgent.match(/Android/i)) == "Android" ? "android" : null;
+          opts.token = token;
+
+          root.subscribe(opts).then(function(response) {
+              $log.debug('Suscribed: ' + response.status);
+            },
+            function(err) {
+              $log.warn('Error: ' + err.status);
+            });
+        });
+      });
+    }
+
+    root.disableNotifications = function() {
+      storageService.getDeviceToken(function(err, token) {
+        root.unsubscribe(token).then(function(response) {
+            $log.debug('Unsubscribed: ' + response.status);
+          },
+          function(err) {
+            $log.warn('Error: ' + err.status);
+          });
+      });
+    }
+
+    root.subscribe = function(opts) {
+      return $http.post('http://192.168.1.128:8000/subscribe', opts);
+    }
+
+    root.unsubscribe = function(token) {
+      return $http.post('http://192.168.1.128:8000/unsubscribe', {
+        token: token
+      });
+    }
+
+    return root;
+
+  });

From 2d64e61654ee7e7f2a6617ceabf23654298c433c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 4 Jan 2016 16:35:34 -0300
Subject: [PATCH 09/18] unsubscribe when wallet is deleted

---
 src/js/controllers/index.js                 |  6 +++++-
 src/js/services/profileService.js           |  4 +++-
 src/js/services/pushNotificationsService.js | 16 +++++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index ac39c4dc2..9fe28c75c 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1273,10 +1273,14 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     go.walletHome();
   });
 
-  $rootScope.$on('Local/EnableNotifications', function(event) {
+  $rootScope.$on('Local/SubscribeNotifications', function(event) {
     pushNotificationsService.enableNotifications();
   });
 
+  $rootScope.$on('Local/UnsubscribeNotifications', function(event, walletId) {
+    pushNotificationsService.unsubscribe(walletId);
+  });
+
   self.debouncedUpdate = lodash.throttle(function() {
     self.updateAll({
       quiet: true
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 9f50e9260..816598c08 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -326,6 +326,8 @@ angular.module('copayApp.services')
         if (err) $log.warn(err);
       });
 
+      $rootScope.$emit('Local/UnsubscribeNotifications', walletId);
+
       $timeout(function() {
         root.setWalletClients();
         root.setAndStoreFocus(null, function() {
@@ -397,7 +399,7 @@ angular.module('copayApp.services')
         handleImport(function() {
           root.setAndStoreFocus(walletId, function() {
             storageService.storeProfile(root.profile, function(err) {
-              $rootScope.$emit('Local/EnableNotifications');
+              $rootScope.$emit('Local/SubscribeNotifications');
               return cb(err, walletId);
             });
           });
diff --git a/src/js/services/pushNotificationsService.js b/src/js/services/pushNotificationsService.js
index ea0f20d11..20040d3e4 100644
--- a/src/js/services/pushNotificationsService.js
+++ b/src/js/services/pushNotificationsService.js
@@ -42,7 +42,7 @@ angular.module('copayApp.services')
     root.enableNotifications = function() {
       storageService.getDeviceToken(function(err, token) {
 
-        lodash.forEach(profileService.getWallets('livenet'), function(wallets) {
+        lodash.forEach(profileService.getWallets('testnet'), function(wallets) {
           var opts = {};
           opts.user = wallets.id;
           opts.type = (navigator.userAgent.match(/iPhone/i)) == "iPhone" ? "ios" : (navigator.userAgent.match(/Android/i)) == "Android" ? "android" : null;
@@ -60,7 +60,7 @@ angular.module('copayApp.services')
 
     root.disableNotifications = function() {
       storageService.getDeviceToken(function(err, token) {
-        root.unsubscribe(token).then(function(response) {
+        root.unsubscribeAll(token).then(function(response) {
             $log.debug('Unsubscribed: ' + response.status);
           },
           function(err) {
@@ -70,11 +70,17 @@ angular.module('copayApp.services')
     }
 
     root.subscribe = function(opts) {
-      return $http.post('http://192.168.1.128:8000/subscribe', opts);
+      return $http.post('http://192.168.1.121:8000/subscribe', opts);
     }
 
-    root.unsubscribe = function(token) {
-      return $http.post('http://192.168.1.128:8000/unsubscribe', {
+    root.unsubscribe = function(user) {
+      return $http.post('http://192.168.1.121:8000/unsubscribe', {
+        user: user
+      });
+    }
+
+    root.unsubscribeAll = function(token) {
+      return $http.post('http://192.168.1.121:8000/unsubscribe', {
         token: token
       });
     }

From a97befc20a8055a63781720fdf73b1223df77ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 7 Jan 2016 16:56:28 -0300
Subject: [PATCH 10/18] adding copayerid to opts.user

---
 src/js/services/profileService.js           |  3 ++-
 src/js/services/pushNotificationsService.js | 11 +++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 816598c08..889321b14 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -664,7 +664,8 @@ angular.module('copayApp.services')
           name: config.aliasFor[c.walletId] || c.walletName,
           id: c.walletId,
           network: c.network,
-          color: config.colorFor[c.walletId] || '#4A90E2'
+          color: config.colorFor[c.walletId] || '#4A90E2',
+          copayerId: c.copayerId
         };
       });
       ret = lodash.filter(ret, function(w) {
diff --git a/src/js/services/pushNotificationsService.js b/src/js/services/pushNotificationsService.js
index 20040d3e4..c3a84866d 100644
--- a/src/js/services/pushNotificationsService.js
+++ b/src/js/services/pushNotificationsService.js
@@ -18,6 +18,7 @@ angular.module('copayApp.services')
       });
 
       push.on('registration', function(data) {
+        $log.debug('Starting registration');
         storageService.setDeviceToken(data.registrationId, function() {
           root.enableNotifications();
         });
@@ -41,13 +42,11 @@ angular.module('copayApp.services')
 
     root.enableNotifications = function() {
       storageService.getDeviceToken(function(err, token) {
-
         lodash.forEach(profileService.getWallets('testnet'), function(wallets) {
           var opts = {};
-          opts.user = wallets.id;
+          opts.user = wallets.id + '$' + wallets.copayerId;
           opts.type = (navigator.userAgent.match(/iPhone/i)) == "iPhone" ? "ios" : (navigator.userAgent.match(/Android/i)) == "Android" ? "android" : null;
           opts.token = token;
-
           root.subscribe(opts).then(function(response) {
               $log.debug('Suscribed: ' + response.status);
             },
@@ -70,17 +69,17 @@ angular.module('copayApp.services')
     }
 
     root.subscribe = function(opts) {
-      return $http.post('http://192.168.1.121:8000/subscribe', opts);
+      return $http.post('http://192.168.1.128:8000/subscribe', opts);
     }
 
     root.unsubscribe = function(user) {
-      return $http.post('http://192.168.1.121:8000/unsubscribe', {
+      return $http.post('http://192.168.1.128:8000/unsubscribe', {
         user: user
       });
     }
 
     root.unsubscribeAll = function(token) {
-      return $http.post('http://192.168.1.121:8000/unsubscribe', {
+      return $http.post('http://192.168.1.128:8000/unsubscribe', {
         token: token
       });
     }

From 50ffb0af232f04c7a1db6f7a2b23c00b3a28d4e3 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Wed, 13 Jan 2016 10:12:10 -0300
Subject: [PATCH 11/18] move push notifications config to configService

---
 src/js/controllers/preferencesGlobal.js     |  4 +--
 src/js/services/configService.js            | 16 ++++++++++--
 src/js/services/pushNotificationsService.js | 28 +++++++--------------
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/js/controllers/preferencesGlobal.js b/src/js/controllers/preferencesGlobal.js
index ab468733f..ee24f76a8 100644
--- a/src/js/controllers/preferencesGlobal.js
+++ b/src/js/controllers/preferencesGlobal.js
@@ -36,12 +36,12 @@ angular.module('copayApp.controllers').controller('preferencesGlobalController',
     var unwatchNotification = $scope.$watch('notifications', function(newVal, oldVal) {
       if (newVal == oldVal) return;
       var opts = {
-        notifications: {
+      pushNotifications: {
           enabled: newVal
         }
       };
       configService.set(opts, function(err) {
-        if (opts.notifications.enabled)
+        if (opts.pushNotifications.enabled)
           pushNotificationsService.enableNotifications();
         else
           pushNotificationsService.disableNotifications();
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 3771c5e9b..702cad585 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -42,8 +42,20 @@ angular.module('copayApp.services').factory('configService', function(storageSer
       url: 'https://insight.bitpay.com:443/api/rates',
     },
 
-    notifications: {
-      enabled: true
+    pushNotifications: {
+      enabled: true,
+      url: 'http://192.168.1.111:8080',
+      config: {
+        android: {
+          senderID: '959259672122',
+        },
+        ios: {
+          alert: 'true',
+          badge: 'true',
+          sound: 'true',
+        },
+        windows: {},
+      }
     },
   };
 
diff --git a/src/js/services/pushNotificationsService.js b/src/js/services/pushNotificationsService.js
index c3a84866d..68eac8027 100644
--- a/src/js/services/pushNotificationsService.js
+++ b/src/js/services/pushNotificationsService.js
@@ -1,31 +1,21 @@
 'use strict';
 angular.module('copayApp.services')
-  .factory('pushNotificationsService', function($http, $log, profileService, storageService, lodash) {
+  .factory('pushNotificationsService', function($http, $log, isMobile, profileService, storageService, configService, lodash) {
     var root = {};
+    var defaults = configService.getDefaults();
 
     root.pushNotificationsInit = function() {
-
-      var push = PushNotification.init({
-        android: {
-          senderID: "959259672122"
-        },
-        ios: {
-          alert: "true",
-          badge: true,
-          sound: 'false'
-        },
-        windows: {}
-      });
+      var push = PushNotification.init(defaults.pushNotifications.config);
 
       push.on('registration', function(data) {
-        $log.debug('Starting registration');
+        $log.debug('Starting push notification registration');
         storageService.setDeviceToken(data.registrationId, function() {
           root.enableNotifications();
         });
       });
 
       push.on('notification', function(data) {
-        $log.debug('Notification event: ', data.message);
+        $log.debug('Push notification event: ', data.message);
         /* data.message,
          data.title,
          data.count,
@@ -45,7 +35,7 @@ angular.module('copayApp.services')
         lodash.forEach(profileService.getWallets('testnet'), function(wallets) {
           var opts = {};
           opts.user = wallets.id + '$' + wallets.copayerId;
-          opts.type = (navigator.userAgent.match(/iPhone/i)) == "iPhone" ? "ios" : (navigator.userAgent.match(/Android/i)) == "Android" ? "android" : null;
+          opts.type = isMobile.iOS() ? "ios" : isMobile.Android() ? "android" : null;
           opts.token = token;
           root.subscribe(opts).then(function(response) {
               $log.debug('Suscribed: ' + response.status);
@@ -69,17 +59,17 @@ angular.module('copayApp.services')
     }
 
     root.subscribe = function(opts) {
-      return $http.post('http://192.168.1.128:8000/subscribe', opts);
+      return $http.post(defaults.pushNotifications.url + '/subscribe', opts);
     }
 
     root.unsubscribe = function(user) {
-      return $http.post('http://192.168.1.128:8000/unsubscribe', {
+      return $http.post(defaults.pushNotifications.url + '/unsubscribe', {
         user: user
       });
     }
 
     root.unsubscribeAll = function(token) {
-      return $http.post('http://192.168.1.128:8000/unsubscribe', {
+      return $http.post(defaults.pushNotifications.url + '/unsubscribe', {
         token: token
       });
     }

From 425d8ffb3324ba64ff1635fd5c430af33679403e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Fri, 15 Jan 2016 11:59:29 -0300
Subject: [PATCH 12/18] push notifications service addapted to bws

---
 src/js/controllers/index.js                 | 30 ++++++++++-----
 src/js/controllers/preferencesGlobal.js     |  6 +--
 src/js/services/profileService.js           |  4 +-
 src/js/services/pushNotificationsService.js | 41 +++++++++------------
 4 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 9fe28c75c..92e408aab 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, pushNotificationsService, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, txFormatService, uxLanguage, $state, glideraService, isMobile, addressbookService) {
+angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, isMobile, pushNotificationsService, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, txFormatService, uxLanguage, $state, glideraService, isMobile, addressbookService) {
   var self = this;
   var SOFT_CONFIRMATION_LIMIT = 12;
   self.isCordova = isCordova;
@@ -12,7 +12,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   self.prevState = 'walletHome';
 
   document.addEventListener('deviceready', function() {
-    if (self.isCordova) {
+    if (isMobile.Android() || isMobile.iOS()) {
       storageService.getDeviceToken(function(err, token) {
         $timeout(function() {
           if (!token) pushNotificationsService.pushNotificationsInit();
@@ -31,15 +31,24 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
   self.menu = [{
     'title': gettext('Receive'),
-    'icon': {false:'icon-receive', true: 'icon-receive-active'},
+    'icon': {
+      false: 'icon-receive',
+      true: 'icon-receive-active'
+    },
     'link': 'receive'
   }, {
     'title': gettext('Activity'),
-    'icon': {false:'icon-activity',true: 'icon-activity-active'},
+    'icon': {
+      false: 'icon-activity',
+      true: 'icon-activity-active'
+    },
     'link': 'walletHome'
   }, {
     'title': gettext('Send'),
-    'icon': {false:'icon-send', true: 'icon-send-active'},
+    'icon': {
+      false: 'icon-send',
+      true: 'icon-send-active'
+    },
     'link': 'send'
   }];
 
@@ -403,7 +412,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
           self.availableMaxBalance = strip((self.availableBalanceSat - feeToSendMaxSat) * self.satToUnit);
           self.feeToSendMaxStr = profileService.formatAmount(feeToSendMaxSat) + ' ' + self.unitName;
         }
-          
+
         if (cb) return cb(self.currentFeePerKb, self.availableMaxBalance, self.feeToSendMaxStr);
       });
     }
@@ -1277,8 +1286,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     pushNotificationsService.enableNotifications();
   });
 
-  $rootScope.$on('Local/UnsubscribeNotifications', function(event, walletId) {
-    pushNotificationsService.unsubscribe(walletId);
+  $rootScope.$on('Local/UnsubscribeNotifications', function(event) {
+    pushNotificationsService.unsubscribe(null, function(err, response) {
+      if (err) $log.warn('Error: ' + err.code);
+      $log.debug('Unsubscribed: ' + response);
+    });
   });
 
   self.debouncedUpdate = lodash.throttle(function() {
@@ -1482,5 +1494,5 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       $rootScope.$apply();
     });
   });
- 
+
 });
diff --git a/src/js/controllers/preferencesGlobal.js b/src/js/controllers/preferencesGlobal.js
index ee24f76a8..36184f34a 100644
--- a/src/js/controllers/preferencesGlobal.js
+++ b/src/js/controllers/preferencesGlobal.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesGlobalController',
-  function($scope, $rootScope, $log, configService, uxLanguage, isCordova, pushNotificationsService) {
+  function($scope, $rootScope, $log, configService, isMobile, uxLanguage, pushNotificationsService) {
 
     this.init = function() {
       var config = configService.getSync();
@@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('preferencesGlobalController',
       $scope.notifications = config.notifications ? config.notifications.enabled : true;
     };
 
-    if (isCordova) $scope.mobile = true;
+    if (isMobile.Android() || isMobile.iOS()) $scope.mobile = true;
     else $scope.mobile = false;
 
     var unwatchSpendUnconfirmed = $scope.$watch('spendUnconfirmed', function(newVal, oldVal) {
@@ -36,7 +36,7 @@ angular.module('copayApp.controllers').controller('preferencesGlobalController',
     var unwatchNotification = $scope.$watch('notifications', function(newVal, oldVal) {
       if (newVal == oldVal) return;
       var opts = {
-      pushNotifications: {
+        pushNotifications: {
           enabled: newVal
         }
       };
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 889321b14..29efab586 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -304,6 +304,8 @@ angular.module('copayApp.services')
     root.deleteWalletFC = function(opts, cb) {
       var fc = root.focusedClient;
       var walletId = fc.credentials.walletId;
+
+      $rootScope.$emit('Local/UnsubscribeNotifications');
       $log.debug('Deleting Wallet:', fc.credentials.walletName);
 
       fc.removeAllListeners();
@@ -326,8 +328,6 @@ angular.module('copayApp.services')
         if (err) $log.warn(err);
       });
 
-      $rootScope.$emit('Local/UnsubscribeNotifications', walletId);
-
       $timeout(function() {
         root.setWalletClients();
         root.setAndStoreFocus(null, function() {
diff --git a/src/js/services/pushNotificationsService.js b/src/js/services/pushNotificationsService.js
index 68eac8027..cb8e1140a 100644
--- a/src/js/services/pushNotificationsService.js
+++ b/src/js/services/pushNotificationsService.js
@@ -34,43 +34,38 @@ angular.module('copayApp.services')
       storageService.getDeviceToken(function(err, token) {
         lodash.forEach(profileService.getWallets('testnet'), function(wallets) {
           var opts = {};
-          opts.user = wallets.id + '$' + wallets.copayerId;
           opts.type = isMobile.iOS() ? "ios" : isMobile.Android() ? "android" : null;
           opts.token = token;
-          root.subscribe(opts).then(function(response) {
-              $log.debug('Suscribed: ' + response.status);
-            },
-            function(err) {
-              $log.warn('Error: ' + err.status);
-            });
+          root.subscribe(opts, wallets.id, function(err, response) {
+            if (err) $log.warn('Error: ' + err.code);
+            $log.debug('Suscribed: ' + JSON.stringify(response));
+          });
         });
       });
     }
 
     root.disableNotifications = function() {
       storageService.getDeviceToken(function(err, token) {
-        root.unsubscribeAll(token).then(function(response) {
-            $log.debug('Unsubscribed: ' + response.status);
-          },
-          function(err) {
-            $log.warn('Error: ' + err.status);
-          });
+        root.unsubscribe(token, function(err, response) {
+          if (err) $log.warn('Error: ' + err.code);
+          $log.debug('Unsubscribed: ' + response);
+        });
       });
     }
 
-    root.subscribe = function(opts) {
-      return $http.post(defaults.pushNotifications.url + '/subscribe', opts);
-    }
-
-    root.unsubscribe = function(user) {
-      return $http.post(defaults.pushNotifications.url + '/unsubscribe', {
-        user: user
+    root.subscribe = function(opts, walletId, cb) {
+      var walletClient = profileService.getClient(walletId);
+      walletClient.pushNotificationsSubscribe(opts, function(err, resp) {
+        if (err) return cb(err);
+        return cb(null, resp);
       });
     }
 
-    root.unsubscribeAll = function(token) {
-      return $http.post(defaults.pushNotifications.url + '/unsubscribe', {
-        token: token
+    root.unsubscribe = function(opts, cb) {
+      var walletClient = profileService.focusedClient;
+      walletClient.pushNotificationsUnsubscribe(opts, function(err, resp) {
+        if (err) return cb(err);
+        return cb(null, resp);
       });
     }
 

From 77d9a02ec3033779e22ab16e4030ae39c4ee0fb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Fri, 15 Jan 2016 12:43:05 -0300
Subject: [PATCH 13/18] remove url from config service

---
 src/js/services/configService.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 702cad585..bd7d90290 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -44,7 +44,6 @@ angular.module('copayApp.services').factory('configService', function(storageSer
 
     pushNotifications: {
       enabled: true,
-      url: 'http://192.168.1.111:8080',
       config: {
         android: {
           senderID: '959259672122',

From d8cfb9dd5ce185a8afba34b973041ba04fc6eb5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Fri, 15 Jan 2016 13:41:18 -0300
Subject: [PATCH 14/18] fix duplicated isMobile

---
 src/js/controllers/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 92e408aab..fb5eea173 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, isMobile, pushNotificationsService, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, txFormatService, uxLanguage, $state, glideraService, isMobile, addressbookService) {
+angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, pushNotificationsService, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, txFormatService, uxLanguage, $state, glideraService, isMobile, addressbookService) {
   var self = this;
   var SOFT_CONFIRMATION_LIMIT = 12;
   self.isCordova = isCordova;
@@ -319,7 +319,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
         return cb(null, opts.walletStatus);
       else {
         self.updateError = false;
-        return fc.getStatus({ twoStep : true }, function(err, ret) {
+        return fc.getStatus({
+          twoStep: true
+        }, function(err, ret) {
           if (err) {
             self.updateError = bwsError.msg(err, gettext('Could not update Wallet'));
           } else {

From 58b573ac4e767bb572f4442e96df43691d23bbdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Fri, 15 Jan 2016 17:09:50 -0300
Subject: [PATCH 15/18] unsubscribe method refactor

---
 src/js/controllers/index.js                 | 11 +++--
 src/js/services/profileService.js           | 48 +++++++++++----------
 src/js/services/pushNotificationsService.js | 18 ++++----
 3 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index fb5eea173..dd012e694 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1288,10 +1288,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     pushNotificationsService.enableNotifications();
   });
 
-  $rootScope.$on('Local/UnsubscribeNotifications', function(event) {
-    pushNotificationsService.unsubscribe(null, function(err, response) {
-      if (err) $log.warn('Error: ' + err.code);
-      $log.debug('Unsubscribed: ' + response);
+  $rootScope.$on('Local/UnsubscribeNotifications', function(event, walletId, cb) {
+    storageService.getDeviceToken(function(err, token) {
+      pushNotificationsService.unsubscribe(token, walletId, function(err, response) {
+        if (err) $log.warn('Error: ' + err.code);
+        $log.debug('Unsubscribed: ' + response);
+        return cb();
+      });
     });
   });
 
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 29efab586..b66f487ff 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -305,35 +305,37 @@ angular.module('copayApp.services')
       var fc = root.focusedClient;
       var walletId = fc.credentials.walletId;
 
-      $rootScope.$emit('Local/UnsubscribeNotifications');
-      $log.debug('Deleting Wallet:', fc.credentials.walletName);
+      $rootScope.$emit('Local/UnsubscribeNotifications', walletId, function() {
 
-      fc.removeAllListeners();
-      root.profile.credentials = lodash.reject(root.profile.credentials, {
-        walletId: walletId
-      });
+        $log.debug('Deleting Wallet:', fc.credentials.walletName);
 
-      delete root.walletClients[walletId];
-      root.focusedClient = null;
+        fc.removeAllListeners();
+        root.profile.credentials = lodash.reject(root.profile.credentials, {
+          walletId: walletId
+        });
 
-      storageService.clearLastAddress(walletId, function(err) {
-        if (err) $log.warn(err);
-      });
+        delete root.walletClients[walletId];
+        root.focusedClient = null;
 
-      storageService.removeTxHistory(walletId, function(err) {
-        if (err) $log.warn(err);
-      });
+        storageService.clearLastAddress(walletId, function(err) {
+          if (err) $log.warn(err);
+        });
 
-      storageService.clearBackupFlag(walletId, function(err) {
-        if (err) $log.warn(err);
-      });
+        storageService.removeTxHistory(walletId, function(err) {
+          if (err) $log.warn(err);
+        });
 
-      $timeout(function() {
-        root.setWalletClients();
-        root.setAndStoreFocus(null, function() {
-          storageService.storeProfile(root.profile, function(err) {
-            if (err) return cb(err);
-            return cb();
+        storageService.clearBackupFlag(walletId, function(err) {
+          if (err) $log.warn(err);
+        });
+
+        $timeout(function() {
+          root.setWalletClients();
+          root.setAndStoreFocus(null, function() {
+            storageService.storeProfile(root.profile, function(err) {
+              if (err) return cb(err);
+              return cb();
+            });
           });
         });
       });
diff --git a/src/js/services/pushNotificationsService.js b/src/js/services/pushNotificationsService.js
index cb8e1140a..c3d36b3a2 100644
--- a/src/js/services/pushNotificationsService.js
+++ b/src/js/services/pushNotificationsService.js
@@ -32,11 +32,11 @@ angular.module('copayApp.services')
 
     root.enableNotifications = function() {
       storageService.getDeviceToken(function(err, token) {
-        lodash.forEach(profileService.getWallets('testnet'), function(wallets) {
+        lodash.forEach(profileService.getWallets('testnet'), function(wallet) {
           var opts = {};
           opts.type = isMobile.iOS() ? "ios" : isMobile.Android() ? "android" : null;
           opts.token = token;
-          root.subscribe(opts, wallets.id, function(err, response) {
+          root.subscribe(opts, wallet.id, function(err, response) {
             if (err) $log.warn('Error: ' + err.code);
             $log.debug('Suscribed: ' + JSON.stringify(response));
           });
@@ -46,9 +46,11 @@ angular.module('copayApp.services')
 
     root.disableNotifications = function() {
       storageService.getDeviceToken(function(err, token) {
-        root.unsubscribe(token, function(err, response) {
-          if (err) $log.warn('Error: ' + err.code);
-          $log.debug('Unsubscribed: ' + response);
+        lodash.forEach(profileService.getWallets('testnet'), function(wallet) {
+          root.unsubscribe(token, wallet.id, function(err, response) {
+            if (err) $log.warn('Error: ' + err.code);
+            $log.debug('Unsubscribed: ' + response);
+          });
         });
       });
     }
@@ -61,9 +63,9 @@ angular.module('copayApp.services')
       });
     }
 
-    root.unsubscribe = function(opts, cb) {
-      var walletClient = profileService.focusedClient;
-      walletClient.pushNotificationsUnsubscribe(opts, function(err, resp) {
+    root.unsubscribe = function(token, walletId, cb) {
+      var walletClient = profileService.getClient(walletId);
+      walletClient.pushNotificationsUnsubscribe(token, function(err, resp) {
         if (err) return cb(err);
         return cb(null, resp);
       });

From 070669d835ba08965244ba83f84c3b25d670f8a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 18 Jan 2016 14:22:42 -0300
Subject: [PATCH 16/18] fix subscribe only when push notifications is enable

---
 src/js/services/profileService.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index b66f487ff..1d1724938 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -371,6 +371,7 @@ angular.module('copayApp.services')
         return cb(gettext('Wallet already in Copay' + ": ") + w.walletName);
       }
 
+      var config = configService.getSync();
       var defaults = configService.getDefaults();
       var bwsFor = {};
       bwsFor[walletId] = opts.bwsurl || defaults.bws.url;
@@ -401,7 +402,8 @@ angular.module('copayApp.services')
         handleImport(function() {
           root.setAndStoreFocus(walletId, function() {
             storageService.storeProfile(root.profile, function(err) {
-              $rootScope.$emit('Local/SubscribeNotifications');
+              if (config.pushNotifications.enabled)
+                $rootScope.$emit('Local/SubscribeNotifications');
               return cb(err, walletId);
             });
           });

From 1a8cd4e59e9025a1f2127133ae8388be9112d901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 18 Jan 2016 17:42:31 -0300
Subject: [PATCH 17/18] delete token arg in unsusbscribe methods

---
 src/js/controllers/index.js                 | 10 ++++------
 src/js/services/pushNotificationsService.js | 14 ++++++--------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index dd012e694..cd82e3482 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1289,12 +1289,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   });
 
   $rootScope.$on('Local/UnsubscribeNotifications', function(event, walletId, cb) {
-    storageService.getDeviceToken(function(err, token) {
-      pushNotificationsService.unsubscribe(token, walletId, function(err, response) {
-        if (err) $log.warn('Error: ' + err.code);
-        $log.debug('Unsubscribed: ' + response);
-        return cb();
-      });
+    pushNotificationsService.unsubscribe(walletId, function(err, response) {
+      if (err) $log.warn('Error: ' + err.code);
+      $log.debug('Unsubscribed: ' + response);
+      return cb();
     });
   });
 
diff --git a/src/js/services/pushNotificationsService.js b/src/js/services/pushNotificationsService.js
index c3d36b3a2..ca4b72370 100644
--- a/src/js/services/pushNotificationsService.js
+++ b/src/js/services/pushNotificationsService.js
@@ -45,12 +45,10 @@ angular.module('copayApp.services')
     }
 
     root.disableNotifications = function() {
-      storageService.getDeviceToken(function(err, token) {
-        lodash.forEach(profileService.getWallets('testnet'), function(wallet) {
-          root.unsubscribe(token, wallet.id, function(err, response) {
-            if (err) $log.warn('Error: ' + err.code);
-            $log.debug('Unsubscribed: ' + response);
-          });
+      lodash.forEach(profileService.getWallets('testnet'), function(wallet) {
+        root.unsubscribe(wallet.id, function(err, response) {
+          if (err) $log.warn('Error: ' + err.code);
+          $log.debug('Unsubscribed: ' + response);
         });
       });
     }
@@ -63,9 +61,9 @@ angular.module('copayApp.services')
       });
     }
 
-    root.unsubscribe = function(token, walletId, cb) {
+    root.unsubscribe = function(walletId, cb) {
       var walletClient = profileService.getClient(walletId);
-      walletClient.pushNotificationsUnsubscribe(token, function(err, resp) {
+      walletClient.pushNotificationsUnsubscribe(function(err, resp) {
         if (err) return cb(err);
         return cb(null, resp);
       });

From a1ff63684f1ccf49ae77168aace1fb063d1dd83c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 19 Jan 2016 19:02:25 -0300
Subject: [PATCH 18/18] update sender Id and package json

---
 package.json                     | 2 +-
 src/js/services/configService.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7a392c4c9..82906f9fa 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "url": "https://github.com/bitpay/copay/issues"
   },
   "dependencies": {
-    "bitcore-wallet-client": "1.2.0",
+    "bitcore-wallet-client": "1.3.0",
     "express": "^4.11.2",
     "fs": "0.0.2",
     "grunt": "^0.4.5",
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index bd7d90290..0d8484ac9 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -46,7 +46,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
       enabled: true,
       config: {
         android: {
-          senderID: '959259672122',
+          senderID: '1036948132229',
         },
         ios: {
           alert: 'true',