push notification subscribe refactor

src/js/controllers/index.js

@@ -13,28 +13,35 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
   document.addEventListener('deviceready', function() {
 
-    if (isCordova) {
+    if (self.isCordova) {
-      var push = PushNotification.init({
+      storageService.getDeviceToken(function(err, token) {
-        android: {
+        if (!token) pushNotificationInit();
-          senderID: "959259672122"
-        },
-        ios: {
-          alert: "true",
-          badge: true,
-          sound: 'false'
-        },
-        windows: {}
       });
     }
 
+  });
+
+  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.walletId;
-      opts.user = fc.credentials.copayerId + "||" + fc.credentials.walletId;
+      opts.type = (navigator.userAgent.match(/iPhone/i)) == "iPhone" ? "ios" : (navigator.userAgent.match(/Android/i)) == "Android" ? "android" : null;
-      opts.type = deviceType;
       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) {
+    storageService.getDeviceToken(function(err, token) {
-      if (val.notifications.enabled) {
+      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) {

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);
       });
     });

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) {

src/js/services/storageService.js

@@ -231,12 +231,12 @@ angular.module('copayApp.services')
       storage.get('addressbook-' + network, cb);
     };
 
-    root.setNotificationsOptions = function(opts, cb) {
+    root.setDeviceToken = function(token, cb) {
-      storage.set('notifications', opts, cb);
+      storage.set('token', token, cb);
     }
 
-    root.getNotificationsOptions = function(cb) {
+    root.getDeviceToken = function(cb) {
-      storage.get('notifications', cb);
+      storage.get('token', cb);
     }
 
     root.removeAddressbook = function(network, cb) {