anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3803 from cmgustavo/ref/push-notification-01

Browse source 
Ref/push notification 01
This commit is contained in:
Matias Alejo Garcia 2016-01-22 08:41:48 -03:00
commit b0a3e9316a
7 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
public/views/preferencesGlobal.html
View file

@ -48,11 +48,16 @@
<switch id="spend-unconfirmed" name="spendUnconfirmed" ng-model="spendUnconfirmed" class="green right"></switch>
<div translate>Use Unconfirmed Funds</div>
</li>
<li ng-show="mobile">
<switch id="push-notifications" name="pushNotifications" ng-model="pushNotifications" class="green right"></switch>
<div translate>Enable push notifications</div>
</li>
</ul>
<div ng-show="index.usePushNotifications">
<h4></h4>
<ul class="no-bullet m0">
<li>
<switch id="push-notifications" name="pushNotifications" ng-model="pushNotifications" class="green right"></switch>
<div translate>Enable push notifications</div>
</li>
</ul>
</div>
<h4></h4>
<ul class="no-bullet m0 ">
<li>

8
src/js/controllers/index.js
View file

@ -5,20 +5,21 @@ angular.module('copayApp.controllers').controller('indexController', function($r
var SOFT_CONFIRMATION_LIMIT = 12;
self.isCordova = isCordova;
self.isChromeApp = isChromeApp;
self.usePushNotifications = isMobile.iOS() || isMobile.Android();
self.isSafari = isMobile.Safari();
self.isWindowsPhoneApp = isMobile.Windows() && isCordova;
self.usePushNotifications = self.isCordova && !isMobile.Windows();
self.onGoingProcess = {};
self.historyShowLimit = 10;
self.updatingTxHistory = {};
self.prevState = 'walletHome';
document.addEventListener('deviceready', function() {
if (self.usePushNotifications) {
storageService.getDeviceToken(function(err, token) {
$timeout(function() {
if (!token) pushNotificationsService.pushNotificationsInit();
}, 5000);
});
});
}
function strip(number) {
return (parseFloat(number.toPrecision(12)));
@ -1285,6 +1286,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
});
$rootScope.$on('Local/SubscribeNotifications', function(event) {
if (!self.usePushNotifications) return;
pushNotificationsService.enableNotifications();

4
src/js/controllers/preferences.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('preferencesController',
function($scope, $rootScope, $timeout, $log, configService, profileService) {
function($scope, $rootScope, $timeout, $log, configService, profileService, txSignService) {
var fc = profileService.focusedClient;
$scope.deleted = false;
@ -75,7 +75,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
};
opts.touchIdFor[walletId] = newVal;
$rootScope.$emit('Local/RequestTouchid', function(err) {
txSignService.setTouchId(function(err) {
if (err) {
$log.debug(err);
$timeout(function() {

5
src/js/controllers/preferencesGlobal.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('preferencesGlobalController',
function($scope, $rootScope, $log, configService, isMobile, uxLanguage, pushNotificationsService) {
function($scope, $rootScope, $log, configService, uxLanguage, pushNotificationsService) {
this.init = function() {
var config = configService.getSync();
@ -17,9 +17,6 @@ angular.module('copayApp.controllers').controller('preferencesGlobalController',
$scope.pushNotifications = config.pushNotifications.enabled;
};
if (isMobile.Android() || isMobile.iOS()) $scope.mobile = true;
else $scope.mobile = false;
var unwatchSpendUnconfirmed = $scope.$watch('spendUnconfirmed', function(newVal, oldVal) {
if (newVal == oldVal) return;
var opts = {

3
src/js/services/configService.js
View file

@ -87,6 +87,9 @@ angular.module('copayApp.services').factory('configService', function(storageSer
if (!configCache.glidera) {
configCache.glidera = defaultConfig.glidera;
}
if (!configCache.pushNotifications) {
configCache.pushNotifications = defaultConfig.pushNotifications;
}
} else {
configCache = lodash.clone(defaultConfig);

4
src/js/services/pushNotificationsService.js
View file

@ -1,9 +1,9 @@
'use strict';
angular.module('copayApp.services')
.factory('pushNotificationsService', function($http, $log, isMobile, profileService, storageService, configService, lodash) {
.factory('pushNotificationsService', function($http, $log, isMobile, profileService, storageService, configService, lodash, isCordova) {
var root = {};
var defaults = configService.getDefaults();
var usePushNotifications = isMobile.iOS() || isMobile.Android();
var usePushNotifications = isCordova && !isMobile.Windows();
root.pushNotificationsInit = function() {
if (!usePushNotifications) return;

18
src/js/services/txSignService.js
View file

@ -2,7 +2,6 @@
angular.module('copayApp.services').factory('txSignService', function($rootScope, profileService, gettextCatalog, lodash, trezor, ledger, configService, bwsError, $log) {
var root = {};
var config = configService.getSync();
var reportSigningStatus = function(opts) {
if (!opts.reporterFn) return;
@ -41,17 +40,26 @@ angular.module('copayApp.services').factory('txSignService', function($rootScope
return cb();
},
function(msg) {
$log.debug('Touch ID Failed:' + msg);
return cb(gettext('Touch ID Failed:') + msg);
$log.debug('Touch ID Failed:' + JSON.stringify(msg));
return cb(gettextCatalog.getString('Touch ID Failed') + ': ' + msg.localizedDescription);
}
);
} catch (e) {
$log.debug('Touch ID Failed:' + e);
return cb(gettext('Touch ID Failed:') + e);
$log.debug('Touch ID Failed:' + JSON.stringify(e));
return cb(gettextCatalog.getString('Touch ID Failed'));
};
};
root.setTouchId = function(cb) {
if (window.touchidAvailable) {
requestTouchId(cb);
} else {
return cb();
}
};
root.checkTouchId = function(cb) {
var config = configService.getSync();
var fc = profileService.focusedClient;
config.touchIdFor = config.touchIdFor || {};
if (window.touchidAvailable && config.touchIdFor[fc.credentials.walletId]) {