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

display fingerprint in export wallet

Browse source
This commit is contained in:
Javier 2016-06-16 12:18:11 -03:00
commit 9ccaf024f7
2 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
public/views/export.html
View file

@ -4,12 +4,13 @@
ng-init="titleSection='Export Wallet'; goBackToState = 'preferencesAdvanced'"> ng-init="titleSection='Export Wallet'; goBackToState = 'preferencesAdvanced'">
</div> </div>
<div class="content preferences" ng-controller="exportController"> <div class="content preferences" ng-controller="exportController" ng-init="init()">
<h4></h4> <h4></h4>
<div ng-show="!backupWalletPlainText"> <div ng-show="!backupWalletPlainText">
<div class="text-warning size-14 m20b" ng-show="error"> <div class="text-warning size-14 m20b" ng-show="error">
<i class="fi-alert size-12"></i> <i class="fi-alert size-12"></i>
<span translate> Failed to export </span> <span ng-show="!touchIdError" translate>Failed to export</span>
<span ng-show="touchIdError">{{touchIdError}}</span>
</div> </div>
<div class="row"> <div class="row">

33
src/js/controllers/export.js
View file

@ -1,15 +1,30 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('exportController', angular.module('copayApp.controllers').controller('exportController',
function($rootScope, $scope, $timeout, $log, backupService, storageService, profileService, platformInfo, notification, go, gettext, gettextCatalog) { function($rootScope, $scope, $timeout, $log, backupService, fingerprintService, configService, storageService, profileService, platformInfo, notification, go, gettext, gettextCatalog) {
var isWP = platformInfo.isWP; var isWP = platformInfo.isWP;
var isAndroid = platformInfo.isAndroid; var isAndroid = platformInfo.isAndroid;
var isCordova = platformInfo.isCordova;
$scope.error = null;
$scope.success = null;
$scope.metaDataEnabled = true;
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
$scope.isEncrypted = fc.isPrivKeyEncrypted(); $scope.isEncrypted = fc.isPrivKeyEncrypted();
$scope.touchIdError = null;
$scope.error = null;
$scope.success = null;
$scope.init = function() {
if (!isCordova) return;
var config = configService.getSync();
var touchidAvailable = fingerprintService.isAvailable();
var touchidEnabled = config.touchIdFor ? config.touchIdFor[fc.credentials.walletId] : null;
if (!touchidAvailable || !touchidEnabled) return;
fingerprintService.check(fc, function(err) {
if (err)
go.path($scope.goBackToState);
});
};
$scope.downloadWalletBackup = function() { $scope.downloadWalletBackup = function() {
$scope.getMetaData($scope.metaDataEnabled, function(err, txsFromLocal, localAddressBook) { $scope.getMetaData($scope.metaDataEnabled, function(err, txsFromLocal, localAddressBook) {
@ -46,7 +61,7 @@ angular.module('copayApp.controllers').controller('exportController',
return cb(null, txsFromLocal, localAddressBook) return cb(null, txsFromLocal, localAddressBook)
}); });
}); });
} };
$scope.getHistoryCache = function(cb) { $scope.getHistoryCache = function(cb) {
storageService.getTxHistory(fc.credentials.walletId, function(err, txs) { storageService.getTxHistory(fc.credentials.walletId, function(err, txs) {
@ -63,7 +78,7 @@ angular.module('copayApp.controllers').controller('exportController',
return cb(null, localTxs); return cb(null, localTxs);
}); });
} };
$scope.getAddressbook = function(cb) { $scope.getAddressbook = function(cb) {
storageService.getAddressbook(fc.credentials.network, function(err, addressBook) { storageService.getAddressbook(fc.credentials.network, function(err, addressBook) {
@ -78,7 +93,7 @@ angular.module('copayApp.controllers').controller('exportController',
return cb(null, localAddressBook); return cb(null, localAddressBook);
}); });
} };
$scope.getBackup = function(cb) { $scope.getBackup = function(cb) {
$scope.getMetaData($scope.metaDataEnabled, function(err, txsFromLocal, localAddressBook) { $scope.getMetaData($scope.metaDataEnabled, function(err, txsFromLocal, localAddressBook) {
@ -101,7 +116,7 @@ angular.module('copayApp.controllers').controller('exportController',
} }
return cb(ew); return cb(ew);
}); });
} };
$scope.viewWalletBackup = function() { $scope.viewWalletBackup = function() {
$timeout(function() { $timeout(function() {