BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #59 from matiu/x 

refactor routes
This commit is contained in:
Javier Donadío 2017-04-18 11:27:46 -03:00 committed by GitHub
parent ef0addc29d bb7186db69
commit 163a45a5a0
2 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/js/controllers/lock.js → src/js/controllers/lockSetup.js
View File

83
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': {
@ -1205,25 +1205,42 @@ 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(defaultView) {
if (!platformInfo.isCordova && !platformInfo.isDevel) {
goTo('tabs.home');
}
function goTo(nextView) {
$state.transitionTo(nextView).then(function() {
if (nextView == 'lockedView')
$ionicHistory.clearHistory();
});
};
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')
goTo('tabs.home');
});
};
} else if (lockMethod == 'pin') {
goTo('pin');
} else if (defaultView) {
goTo(defaultView);
}
});
}
$ionicPlatform.on('resume', function() {
checkAndApplyLock();
});
$ionicPlatform.on('menubutton', function() {
@ -1266,27 +1283,11 @@ 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();
});
}
if (platformInfo.isCordova)
startupService.ready();
checkAndApplyLock('tabs.home');
});
};
// After everything have been loaded, initialize handler URL