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

Merge pull request #1801 from matiaspando/feature/importAndLogin 

Importing a profile also logs in
This commit is contained in:
Matias Alejo Garcia 2014-11-14 19:19:20 -03:00
parent ead34550d4 d107dd129c
commit 927e4eebe8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/controllers/importProfile.js
View File

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('ImportProfileController',
function($scope, $rootScope, $location, controllerUtils, notification, isMobile, pluginManager) {
function($scope, $rootScope, $location, controllerUtils, notification, isMobile, pluginManager, identityService) {
controllerUtils.redirIfLogged();
$scope.title = 'Import a backup';
@ -30,8 +30,8 @@ angular.module('copayApp.controllers').controller('ImportProfileController',
if (err && !iden) {
$scope.error = (err.toString() || '').match('BADSTR') ? 'Bad password or corrupt profile file' : 'Unknown error';
} else {
notification.info('Success', 'Profile imported successfully');
$location.path('/');
var firstWallet = iden.getLastFocusedWallet();
controllerUtils.bindProfile($scope, iden, firstWallet);
}
});
};

1
js/services/identityService.js
View File

@ -43,7 +43,6 @@ angular.module('copayApp.services')
$timeout(function() {
$rootScope.$digest()
}, 1);
return;
}
var walletOptions = {