Merge pull request #3988 from JDonadio/fix/tap-on-notification-03

Fix tap on notification

public/views/preferencesGlobal.html

@@ -1,6 +1,6 @@
 
-<div 
+<div
-  class="topbar-container" 
+  class="topbar-container"
   ng-include="'views/includes/topbar.html'"
   ng-init="titleSection='Global preferences'; closeToHome = true; noColor = true">
 </div>
@@ -16,7 +16,7 @@
       </div>
       <div translate>Language</div>
     </li>
-  </ul> 
+  </ul>
   <h4></h4>
   <ul class="no-bullet m0 ">
     <li ng-click="$root.go('preferencesUnit')">
@@ -42,13 +42,13 @@
         <i class="icon-arrow-right3 size-24"></i>
       </div>
       <div translate>Bitcoin Network Fee Policy</div>
-    </li>  
+    </li>
     <li>
       <switch id="spend-unconfirmed" name="spendUnconfirmed" ng-model="spendUnconfirmed" class="green right"></switch>
       <div translate>Use Unconfirmed Funds</div>
     </li>
   </ul>
-  <div ng-show="index.usePushNotifications">
+  <div ng-show="prefGlobal.usePushNotifications">
     <h4></h4>
     <ul class="no-bullet m0">
       <li>
@@ -63,8 +63,8 @@
       <switch id="glidera-enabled" name="glideraEnabled" ng-model="glideraEnabled" class="green right"></switch>
       <div>Enable Glidera Service</div>
     </li>
- 
+
-    <!-- Disabled for testnet 
+    <!-- Disabled for testnet
     <li ng-show="glideraEnabled">
       <span>Glidera Sandbox</span>
       <switch id="glidera-testnet" name="glideraTestnet" ng-model="glideraTestnet" class="green right"></switch>
@@ -74,7 +74,7 @@
   <h4></h4>
   <ul class="no-bullet m0">
     <li ng-click="$root.go('about')">
-      <i class="icon-arrow-right3 size-24 right text-gray"></i>  
+      <i class="icon-arrow-right3 size-24 right text-gray"></i>
       <div translate>About Copay</div>
     </li>
   </ul>

src/js/controllers/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, bwcService, pushNotificationsService, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, nodeWebkit, addonManager, isChromeApp, bwsError, txFormatService, uxLanguage, $state, glideraService, isMobile, addressbookService) {
+angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, bwcService, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, nodeWebkit, addonManager, isChromeApp, bwsError, txFormatService, uxLanguage, $state, glideraService, isMobile, addressbookService) {
   var self = this;
   var SOFT_CONFIRMATION_LIMIT = 12;
   var errors = bwcService.getErrors();
@@ -11,7 +11,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   ret.isChromeApp = isChromeApp;
   ret.isSafari = isMobile.Safari();
   ret.isWindowsPhoneApp = isMobile.Windows() && isCordova;
-  ret.usePushNotifications = ret.isCordova && !isMobile.Windows();
   ret.onGoingProcess = {};
   ret.historyShowLimit = 10;
   ret.historyShowMoreLimit = 100;
@@ -49,7 +48,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   ret.tab = 'walletHome';
   var vanillaScope = ret;
 
-
   function strip(number) {
     return (parseFloat(number.toPrecision(12)));
   };
@@ -1379,10 +1377,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     });
   });
 
-  $rootScope.$on('Local/pushNotificationsReady', function(event) {
-    pushNotificationsService.enableNotifications(profileService.walletClients);
-  });
-
   self.debouncedUpdate = lodash.throttle(function() {
     self.updateAll({
       quiet: true
@@ -1491,7 +1485,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     });
   });
 
-  //untilItChange FALSE 
+  //untilItChange FALSE
   lodash.each(['NewTxProposal', 'TxProposalFinallyRejected', 'TxProposalRemoved', 'NewOutgoingTxByThirdParty',
     'Local/GlideraTx'
   ], function(eventName) {

src/js/controllers/preferencesGlobal.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesGlobalController',
-  function($scope, $rootScope, $log, configService, uxLanguage, pushNotificationsService, profileService, feeService) {
+  function($scope, $rootScope, $log, configService, uxLanguage, isCordova, isMobile, pushNotificationsService, profileService, feeService) {
 
     this.init = function() {
       var config = configService.getSync();
@@ -13,6 +13,7 @@ angular.module('copayApp.controllers').controller('preferencesGlobalController',
       };
       this.feeOpts = feeService.feeOpts;
       this.currentFeeLevel = feeService.getCurrentFeeLevel();
+      this.usePushNotifications = isCordova && !isMobile.Windows();
       $scope.spendUnconfirmed = config.wallet.spendUnconfirmed;
       $scope.glideraEnabled = config.glidera.enabled;
       $scope.glideraTestnet = config.glidera.testnet;

src/js/services/profileService.js

@@ -1,9 +1,10 @@
 'use strict';
 angular.module('copayApp.services')
-  .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, pushNotificationsService, isChromeApp, isCordova, gettext, gettextCatalog, nodeWebkit, bwsError, uxLanguage, bitcore) {
+  .factory('profileService', function profileServiceFactory($rootScope, $timeout, $filter, $log, sjcl, lodash, storageService, bwcService, configService, notificationService, pushNotificationsService, isChromeApp, isCordova, isMobile, gettext, gettextCatalog, nodeWebkit, bwsError, uxLanguage, bitcore) {
 
     var root = {};
     var errors = bwcService.getErrors();
+    var usePushNotifications = isCordova && !isMobile.Windows();
 
     var FOREGROUND_UPDATE_PERIOD = 5;
     var BACKGROUND_UPDATE_PERIOD = 30;
@@ -133,22 +134,42 @@ angular.module('copayApp.services')
           if (err) return cb(err);
           root._setFocus(focusedWalletId, function() {
             $rootScope.$emit('Local/ProfileBound');
-            storageService.getDeviceToken(function(err, token) {
+            if (usePushNotifications)
-              if (!token)
+              root.pushNotificationsInit();
-                pushNotificationsService.pushNotificationsInit();
+            root.isDisclaimerAccepted(function(val) {
-
+              if (!val) {
-              root.isDisclaimerAccepted(function(val) {
+                return cb(new Error('NONAGREEDDISCLAIMER: Non agreed disclaimer'));
-                if (!val) {
+              } else {
-                  return cb(new Error('NONAGREEDDISCLAIMER: Non agreed disclaimer'));
+                return cb();
-                } else {
+              }
-                  return cb();
-                }
-              });
             });
           });
         });
       });
+    };
 
+    root.pushNotificationsInit = function() {
+      var defaults = configService.getDefaults();
+      var push = pushNotificationsService.init(root.walletClients);
+
+      push.on('notification', function(data) {
+        if (!data.additionalData.foreground) {
+          window.ignoreMobilePause = true;
+          $log.debug('Push notification event: ', data.message);
+
+          $timeout(function() {
+            var wallets = root.getWallets();
+            var walletToFind = data.additionalData.walletId;
+
+            var walletFound = lodash.find(wallets, function(w) {
+              return (lodash.isEqual(walletToFind, sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(w.id))));
+            });
+
+            if (!walletFound) return $log.debug('Wallet not found');
+            root.setAndStoreFocus(walletFound.id, function() {});
+          }, 100);
+        }
+      });
     };
 
 

src/js/services/pushNotificationsService.js

@@ -1,25 +1,23 @@
 'use strict';
 angular.module('copayApp.services')
-  .factory('pushNotificationsService', function($http, $rootScope, $log, isMobile, storageService, configService, lodash, isCordova) {
+  .factory('pushNotificationsService', function($log, isMobile, storageService, configService, lodash, isCordova) {
     var root = {};
-    var defaults = configService.getDefaults();
     var usePushNotifications = isCordova && !isMobile.Windows();
 
-    root.pushNotificationsInit = function() {
+    root.init = function(walletsClients) {
-      if (!usePushNotifications) return;
+      var defaults = configService.getDefaults();
-
-      var config = configService.getSync();
-      if (!config.pushNotifications.enabled) return;
-
       var push = PushNotification.init(defaults.pushNotifications.config);
 
       push.on('registration', function(data) {
+        if (root.token) return;
         $log.debug('Starting push notification registration');
-        storageService.setDeviceToken(data.registrationId, function() {
+        root.token = data.registrationId;
-          $rootScope.$emit('Local/pushNotificationsReady');
+        var config = configService.getSync();
-        });
+        if (config.pushNotifications.enabled) root.enableNotifications(walletsClients);
       });
-    };
+
+      return push;
+    }
 
     root.enableNotifications = function(walletsClients) {
       if (!usePushNotifications) return;
@@ -27,22 +25,18 @@ angular.module('copayApp.services')
       var config = configService.getSync();
       if (!config.pushNotifications.enabled) return;
 
-      storageService.getDeviceToken(function(err, token) {
+      if (!root.token) {
+        $log.warn('No token available for this device. Cannot set push notifications');
+        return;
+      }
 
-        if (err || !token) {
+      lodash.forEach(walletsClients, function(walletClient) {
-          $log.warn('No token available for this device. Cannot set push notifications');
+        var opts = {};
-          return;
+        opts.type = isMobile.iOS() ? "ios" : isMobile.Android() ? "android" : null;
-        }
+        opts.token = root.token;
-
+        root.subscribe(opts, walletClient, function(err, response) {
-
+          if (err) $log.warn('Subscription error: ' + err.message + ': ' + JSON.stringify(opts));
-        lodash.forEach(walletsClients, function(walletClient) {
+          else $log.debug('Subscribed to push notifications service: ' + JSON.stringify(response));
-          var opts = {};
-          opts.type = isMobile.iOS() ? "ios" : isMobile.Android() ? "android" : null;
-          opts.token = token;
-          root.subscribe(opts, walletClient, function(err, response) {
-            if (err) $log.warn('Subscription error: ' + err.message +  ': ' + JSON.stringify(opts));
-            else $log.debug('Subscribed to push notifications service: ' + JSON.stringify(response));
-          });
         });
       });
     }

src/js/services/storageService.js

@@ -231,14 +231,6 @@ angular.module('copayApp.services')
       storage.get('addressbook-' + network, cb);
     };
 
-    root.setDeviceToken = function(token, cb) {
-      storage.set('pushToken', token, cb);
-    }
-
-    root.getDeviceToken = function(cb) {
-      storage.get('pushToken', cb);
-    }
-
     root.removeAddressbook = function(network, cb) {
       storage.remove('addressbook-' + network, cb);
     };