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

refactor profile creation

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-11-17 13:36:31 -03:00
commit 691139f2b1
7 changed files with 70 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/js/controllers/disclaimer.js
View file

@ -1,38 +1,37 @@
'use strict';
angular.module('copayApp.controllers').controller('disclaimerController',
function($scope, $timeout, $log, profileService, isCordova, storageService, gettextCatalog, applicationService, uxLanguage, go) {
function($scope, $timeout, $log, profileService, isCordova, storageService, gettextCatalog, uxLanguage, go) {
self = this;
$scope.noProfile = true;
$scope.lang = uxLanguage.currentLanguage;
$scope.create = function() {
storageService.setCopayDisclaimerFlag(function(err) {
applicationService.restart();
$scope.goHome = function() {
go.walletHome();
};
var create = function () {
$scope.creatingProfile = true;
profileService.create({}, function(err) {
if (err) {
if (err == 'EEXISTS')
return go.walletHome();
$log.warn(err);
$scope.error = err;
$scope.$apply();
$timeout(function() {
$log.warn('Retrying to create profile......');
create();
}, 3000);
} else {
$scope.error = "";
$scope.creatingProfile = false;
}
});
};
$scope.init = function(noWallet) {
storageService.getCopayDisclaimerFlag(function(err, val) {
$scope.lang = uxLanguage.currentLanguage;
$scope.agreed = val;
profileService.create({
noWallet: noWallet
}, function(err) {
if (err && !'EEXIST') {
$log.warn(err);
$scope.error = err;
$scope.$apply();
$scope.noProfile = true;
$timeout(function() {
$scope.init();
}, 3000);
} else {
$scope.error = "";
$scope.noProfile = false;
}
});
});
};
// create();
});

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

@ -1295,17 +1295,14 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$rootScope.$on('Local/NewFocusedWallet', function() {
self.setFocusedWallet();
self.updateTxHistory();
storageService.getCopayDisclaimerFlag(function(err, val) {
if (val) go.walletHome();
storageService.getCleanAndScanAddresses(function(err, walletId) {
if (walletId && profileService.walletClients[walletId]) {
$log.debug('Clear last address cache and Scan ', walletId);
addressService.expireAddress(walletId, function(err) {
self.startScan(walletId);
});
storageService.removeCleanAndScanAddresses(function() {});
}
});
storageService.getCleanAndScanAddresses(function(err, walletId) {
if (walletId && profileService.walletClients[walletId]) {
$log.debug('Clear last address cache and Scan ', walletId);
addressService.expireAddress(walletId, function(err) {
self.startScan(walletId);
});
storageService.removeCleanAndScanAddresses(function() {});
}
});
});