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

Merge pull request #5896 from JDonadio/bug/config-lock

Browse source 
Fix lock options by default
This commit is contained in:
Matias Alejo Garcia 2017-04-19 19:51:54 +02:00 • committed by GitHub
commit 79653c5945
8 changed files with 96 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/js/controllers/lock.js → src/js/controllers/lockSetup.js
View file

@ -1,21 +1,16 @@
'use strict';
angular.module('copayApp.controllers').controller('lockController', function($state, $scope, $timeout, $log, configService, popupService, gettextCatalog, appConfigService, fingerprintService, profileService, lodash) {
angular.module('copayApp.controllers').controller('lockSetupController', function($state, $scope, $timeout, $log, configService, popupService, gettextCatalog, appConfigService, fingerprintService, profileService, lodash) {
function init() {
var config = configService.getSync();
$scope.locking = config.lock.method != 'pin';
$scope.options = [
{
method: 'none',
method: null,
label: gettextCatalog.getString('Disabled'),
value: config.lock.method == '',
},
{
method: 'pin',
label: gettextCatalog.getString('Enable PIN'),
value: config.lock.method == 'pin',
label: gettextCatalog.getString('Lock by PIN'),
needsBackup: null,
},
];
@ -23,13 +18,17 @@ angular.module('copayApp.controllers').controller('lockController', function($st
if (fingerprintService.isAvailable()) {
$scope.options.push({
method: 'fingerprint',
label: gettextCatalog.getString('Enable Fingerprint'),
value: config.lock.method == 'fingerprint',
label: gettextCatalog.getString('Lock by Fingerprint'),
needsBackup: null,
});
}
$scope.currentOption = lodash.find($scope.options, 'value');
var config = configService.getSync();
var method = config.lock && config.lock.method;
if (!method) $scope.currentOption = $scope.options[0];
else $scope.currentOption = lodash.find($scope.options, {
'method': method
});
processWallets();
};
@ -70,21 +69,24 @@ angular.module('copayApp.controllers').controller('lockController', function($st
});
};
$scope.select = function(method) {
if (method == 'none')
$scope.select = function(selectedMethod) {
var config = configService.getSync();
var savedMethod = config.lock && config.lock.method;
if (!selectedMethod)
saveConfig();
else if (method == 'fingerprint') {
var config = configService.getSync();
if (config.lock.method == 'pin') {
else if (selectedMethod == 'fingerprint') {
if (savedMethod == 'pin') {
askForDisablePin(function(disablePin) {
if (disablePin) saveConfig('fingerprint');
else init();
});
} else saveConfig('fingerprint');
} else if (method == 'pin') {
$state.transitionTo('tabs.lock.pin', {
} else if (selectedMethod == 'pin') {
if (savedMethod == 'pin') return;
$state.transitionTo('tabs.pin', {
fromSettings: true,
locking: $scope.locking
locking: savedMethod == 'pin' ? false : true
});
}
$timeout(function() {
@ -93,7 +95,7 @@ angular.module('copayApp.controllers').controller('lockController', function($st
};
function askForDisablePin(cb) {
var message = gettextCatalog.getString('{{appName}} is protected by Pin. Are you sure you want to disable it?', {
var message = gettextCatalog.getString('{{appName}} startup is locked by PIN. Are you sure you want to disable it?', {
appName: appConfigService.nameCase
});
var okText = gettextCatalog.getString('Continue');
@ -107,8 +109,8 @@ angular.module('copayApp.controllers').controller('lockController', function($st
function saveConfig(method) {
var opts = {
lock: {
method: method || '',
value: '',
method: method || null,
value: null,
}
};

15
src/js/controllers/pin.js
View file

@ -15,6 +15,7 @@ angular.module('copayApp.controllers').controller('pinController', function($sta
$scope.$on("$ionicView.enter", function(event) {
configService.whenAvailable(function(config) {
if (!config.lock) return;
$scope.bannedUntil = config.lock.bannedUntil || null;
if ($scope.bannedUntil) {
var now = Math.floor(Date.now() / 1000);
@ -156,12 +157,13 @@ angular.module('copayApp.controllers').controller('pinController', function($sta
function saveSettings(method, value) {
var config = configService.getSync();
var attempts = config.lock && config.lock.attempts ? config.lock.attempts : 0;
var opts = {
lock: {
method: method || '',
value: value || '',
method: method || null,
value: value || null,
bannedUntil: null,
attempts: config.lock.attempts + 1,
attempts: attempts + 1,
}
};
@ -173,7 +175,12 @@ angular.module('copayApp.controllers').controller('pinController', function($sta
$scope.close = function(delay) {
$timeout(function() {
$ionicHistory.viewHistory().backView ? $ionicHistory.goBack() : $state.go('tabs.home');
var shouldReturn = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName != 'starting';
if (shouldReturn)
$ionicHistory.goBack()
else
$state.go('tabs.home');
}, delay || 1);
};
});

4
src/js/controllers/tab-settings.js
View file

@ -54,8 +54,8 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
$scope.isDevel = platformInfo.isDevel;
$scope.appName = appConfigService.nameCase;
configService.whenAvailable(function(config) {
$scope.locked = config.lock && config.lock.method != '' ? true : false;
$scope.method = config.lock && config.lock.method != '' ? config.lock.method.charAt(0).toUpperCase() + config.lock.method.slice(1) : gettextCatalog.getString('Disabled');
$scope.locked = config.lock && config.lock.method;
$scope.method = $scope.locked ? config.lock.method.charAt(0).toUpperCase() + config.lock.method.slice(1) : gettextCatalog.getString('Disabled');
});
});

93
src/js/routes.js
View file

@ -463,16 +463,16 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
}
})
.state('tabs.lock', {
url: '/lock',
.state('tabs.lockSetup', {
url: '/lockSetup',
views: {
'tab-settings@tabs': {
controller: 'lockController',
templateUrl: 'views/lock.html',
controller: 'lockSetupController',
templateUrl: 'views/lockSetup.html',
}
}
})
.state('tabs.lock.pin', {
.state('tabs.pin', {
url: '/pin/:fromSettings/:locking',
views: {
'tab-settings@tabs': {
@ -1195,25 +1195,53 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
// Nothing to do
});
$ionicPlatform.on('resume', function() {
configService.whenAvailable(function(config) {
var nextView;
var lock = config.lock;
if (lock && lock.method == 'fingerprint' && fingerprintService.isAvailable()) {
fingerprintService.check('unlockingApp', function(err) {
if (err) goTo('lockedView');
else if ($ionicHistory.currentStateName() == 'lockedView') goTo('tabs.home');
});
} else if (lock && lock.method == 'pin') {
goTo('pin');
}
function goTo(nextView) {
$state.transitionTo(nextView).then(function() {
if (nextView == 'lockedView') $ionicHistory.clearHistory();
function checkAndApplyLock(onResume) {
var defaultView = 'tabs.home';
if (!platformInfo.isCordova && !platformInfo.isDevel) {
goTo(defaultView);
}
if (onResume) {
var now = Math.floor(Date.now() / 1000);
if (now < openURLService.unlockUntil) {
$log.debug('Skip startup locking');
return;
}
}
function goTo(nextView) {
nextView = nextView || defaultView;
$state.transitionTo(nextView).then(function() {
if (nextView == 'lockedView')
$ionicHistory.clearHistory();
});
};
startupService.ready();
configService.whenAvailable(function(config) {
var lockMethod = config.lock && config.lock.method;
$log.debug('App Lock:' + (lockMethod || 'no'));
if (lockMethod == 'fingerprint' && fingerprintService.isAvailable()) {
fingerprintService.check('unlockingApp', function(err) {
if (err)
goTo('lockedView');
if ($ionicHistory.currentStateName() == 'lockedView' || !onResume)
goTo('tabs.home');
});
};
} else if (lockMethod == 'pin') {
goTo('pin');
} else {
goTo(defaultView);
}
});
}
$ionicPlatform.on('resume', function() {
checkAndApplyLock(true);
});
$ionicPlatform.on('menubutton', function() {
@ -1256,33 +1284,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
disableAnimate: true,
historyRoot: true
});
if (platformInfo.isCordova || platformInfo.isDevel) {
startupService.ready();
configService.whenAvailable(function(config) {
var lock = config.lock;
if (fingerprintService.isAvailable() && lock && lock.method == 'fingerprint') {
fingerprintService.check('unlockingApp', function(err) {
if (err) goTo('lockedView');
else goTo('tabs.home');
});
} else if (lock && lock.method == 'pin') {
goTo('pin');
} else
goTo('tabs.home');
});
} else goTo('tabs.home');
function goTo(nextView) {
$state.transitionTo(nextView).then(function() {
$ionicHistory.clearHistory();
});
}
checkAndApplyLock();
});
};
// After everything have been loaded, initialize handler URL
$timeout(function() {
openURLService.init();
}, 1000);
});
});
});

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

@ -54,8 +54,8 @@ angular.module('copayApp.services').factory('configService', function(storageSer
},
lock: {
method: '',
value: '',
method: null,
value: null,
bannedUntil: null,
attempts: null,
},

8
src/js/services/openURL.js
View file

@ -1,9 +1,15 @@
'use strict';
angular.module('copayApp.services').factory('openURLService', function($rootScope, $ionicHistory, $document, $log, $state, platformInfo, lodash, profileService, incomingData, appConfigService) {
var DELAY_UNLOCK_TIME = 2 * 60;
var root = {};
root.unlockUntil = null;
var handleOpenURL = function(args) {
root.unlockUntil = Math.floor(Date.now() / 1000) + DELAY_UNLOCK_TIME;
$log.debug('Set unlock time until: ' + root.unlockUntil);
$log.info('Handling Open URL: ' + JSON.stringify(args));
// Stop it from caching the first view as one to return when the app opens
$ionicHistory.nextViewOptions({
@ -103,5 +109,5 @@ angular.module('copayApp.services').factory('openURLService', function($rootScop
});
};
return root;
return root;
});

2
www/views/lock.html → www/views/lockSetup.html
View file

@ -1,6 +1,6 @@
<ion-view class="settings">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Lock App' | translate}}</ion-nav-title>
<ion-nav-title>{{'Startup Lock' | translate}}</ion-nav-title>
<ion-nav-back-button>
</ion-nav-back-button>
</ion-nav-bar>

2
www/views/tab-settings.html
View file

@ -89,7 +89,7 @@
<i class="icon bp-arrow-right"></i>
</a>
<a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.lock" ng-if="isCordova || isDevel">
<a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.lockSetup" ng-if="isCordova || isDevel">
<i class="icon ion-ios-locked-outline" ng-if="locked"></i>
<i class="icon ion-ios-unlocked-outline" ng-if="!locked"></i>
<span class="setting-title">{{'Lock App' | translate}}</span>