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

fix no conecction bug in disclaimer

Browse source
This commit is contained in:
Gabriel Bazán 2015-12-14 14:02:27 -03:00
commit 3901d2d72e
2 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,10 +3,13 @@
angular.module('copayApp.controllers').controller('disclaimerController', angular.module('copayApp.controllers').controller('disclaimerController',
function($scope, $timeout, $log, profileService, isCordova, storageService, applicationService, gettextCatalog, uxLanguage, go) { function($scope, $timeout, $log, profileService, isCordova, storageService, applicationService, gettextCatalog, uxLanguage, go) {
self = this; self = this;
self.tries = 0;
var create = function() { var create = function(noWallet) {
$scope.creatingProfile = true; $scope.creatingProfile = true;
profileService.create({}, function(err) { profileService.create({
noWallet: noWallet
}, function(err) {
if (err) { if (err) {
$log.warn(err); $log.warn(err);
@ -14,7 +17,13 @@ angular.module('copayApp.controllers').controller('disclaimerController',
$scope.$apply(); $scope.$apply();
$timeout(function() { $timeout(function() {
$log.warn('Retrying to create profile......'); $log.warn('Retrying to create profile......');
create(); if (self.tries == 3) {
self.tries == 0;
create(true);
} else {
self.tries += 1;
create(false);
}
}, 3000); }, 3000);
} else { } else {
$scope.error = ""; $scope.error = "";
@ -26,7 +35,7 @@ angular.module('copayApp.controllers').controller('disclaimerController',
this.init = function() { this.init = function() {
self.lang = uxLanguage.currentLanguage; self.lang = uxLanguage.currentLanguage;
storageService.getProfile(function(err, profile) { storageService.getProfile(function(err, profile) {
if (!profile) create(); if (!profile) create(false);
else $scope.creatingProfile = false; else $scope.creatingProfile = false;
//compatible //compatible

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

@ -154,7 +154,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.disclaimerAccepted = true; self.disclaimerAccepted = true;
profileService.setDisclaimerAccepted(function(err) { profileService.setDisclaimerAccepted(function(err) {
if (err) $log.error(err); if (err) $log.error(err);
go.walletHome(); if (lodash.isEmpty(profileService.focusedClient)) {
$rootScope.$emit('Local/NoWallets');
} else go.walletHome();
}); });
}; };
@ -1357,12 +1359,16 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}); });
$rootScope.$on('Local/NoWallets', function(event) { $rootScope.$on('Local/NoWallets', function(event) {
$timeout(function() { profileService.isDisclaimerAccepted(function(v) {
self.hasProfile = true; if (v) {
self.noFocusedWallet = true; $timeout(function() {
self.isComplete = null; self.hasProfile = true;
self.walletName = null; self.noFocusedWallet = true;
go.path('import'); self.isComplete = null;
self.walletName = null;
go.path('import');
});
}
}); });
}); });