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

Copay: Terms of Use in APP

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-06-11 11:59:48 -03:00
commit 1224f89c17
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
7 changed files with 113 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/css/main.css
View file

@ -157,6 +157,9 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
overflow: auto;
}
.content.disclaimer {
top: 0;
}
.logo-setup {
text-align: center;

37
src/js/routes.js
View file

@ -73,10 +73,14 @@ angular
views: {
'main': {
templateUrl: 'views/splash.html',
controller: function($scope, $timeout, $log, profileService, go) {
if (profileService.profile) {
go.walletHome();
}
controller: function($scope, $timeout, $log, profileService, storageService, go) {
storageService.getCopayDisclaimer(function(err, val) {
if (!val) go.path('disclaimer');
if (profileService.profile) {
go.walletHome();
}
});
$scope.create = function(noWallet) {
$scope.creatingProfile = true;
@ -97,6 +101,27 @@ angular
}
}
})
$stateProvider
.state('disclaimer', {
url: '/disclaimer',
needProfile: false,
views: {
'main': {
templateUrl: 'views/disclaimer.html',
controller: function($scope, storageService, applicationService) {
storageService.getCopayDisclaimer(function(err, val) {
$scope.agreed = val;
});
$scope.agree = function() {
storageService.setCopayDisclaimer(function(err) {
applicationService.restart();
});
};
}
}
}
})
.state('walletHome', {
url: '/',
walletShouldBeComplete: true,
@ -427,6 +452,7 @@ angular
preferencesEmail: 12,
about: 12,
logs: 13,
disclaimer: 13,
add: 11,
create: 12,
join: 12,
@ -451,6 +477,9 @@ angular
if (err.message.match('NOPROFILE')) {
$log.debug('No profile... redirecting');
$state.transitionTo('splash');
} else if (err.message.match('NONAGREEDDISCLAIMER')) {
$log.debug('Display disclaimer... redirecting');
$state.transitionTo('disclaimer');
} else {
throw new Error(err); // TODO
}

42
src/js/services/profileService.js
View file

@ -135,26 +135,32 @@ angular.module('copayApp.services')
};
root.loadAndBindProfile = function(cb) {
storageService.getProfile(function(err, profile) {
if (err) {
$rootScope.$emit('Local/DeviceError', err);
return cb(err);
}
if (!profile) {
// Migration??
storageService.tryToMigrate(function(err, migratedProfile) {
if (err) return cb(err);
if (!migratedProfile)
return cb(new Error('NOPROFILE: No profile'));
profile = migratedProfile;
return root.bindProfile(profile, cb);
})
storageService.getCopayDisclaimer(function(err, val) {
if (!val) {
return cb(new Error('NONAGREEDDISCLAIMER: Non agreed disclaimer'));
} else {
$log.debug('Profile read');
return root.bindProfile(profile, cb);
}
storageService.getProfile(function(err, profile) {
if (err) {
$rootScope.$emit('Local/DeviceError', err);
return cb(err);
}
if (!profile) {
// Migration??
storageService.tryToMigrate(function(err, migratedProfile) {
if (err) return cb(err);
if (!migratedProfile)
return cb(new Error('NOPROFILE: No profile'));
profile = migratedProfile;
return root.bindProfile(profile, cb);
})
} else {
$log.debug('Profile read');
return root.bindProfile(profile, cb);
}
});
}
});
};

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

@ -176,5 +176,13 @@ angular.module('copayApp.services')
storage.remove('config', cb);
};
root.setCopayDisclaimer = function(cb) {
storage.set('agreeDisclaimer', true, cb);
};
root.getCopayDisclaimer = function(cb) {
storage.get('agreeDisclaimer', cb);
};
return root;
});