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

add options to enter Priv Key on join

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-08-20 18:00:33 -04:00
commit 2fbbd2a53a
3 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/controllers/join.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('JoinController',
function($scope, $rootScope, $timeout, walletFactory, controllerUtils, Passphrase, notification) {
function($scope, $rootScope, $timeout, $location, walletFactory, controllerUtils, Passphrase, notification) {
controllerUtils.redirIfLogged();
$rootScope.fromSetup = false;
$scope.loading = false;
@ -15,6 +15,13 @@ angular.module('copayApp.controllers').controller('JoinController',
var context;
var localMediaStream;
var s = ($location.search()).enterPrivate;
if (s) {
$scope.enterPrivate = true;
}
var _scan = function(evt) {
if (localMediaStream) {
context.drawImage(video, 0, 0, 300, 225);
@ -112,7 +119,7 @@ angular.module('copayApp.controllers').controller('JoinController',
walletFactory.network.on('badSecret', function() {});
Passphrase.getBase64Async($scope.joinPassword, function(passphrase) {
walletFactory.joinCreateSession($scope.connectionId, $scope.nickname, passphrase, function(err, w) {
walletFactory.joinCreateSession($scope.connectionId, $scope.nickname, passphrase, $scope.enterPrivate ? $scope.private : 'null', function(err, w) {
$scope.loading = false;
if (err || !w) {
if (err === 'joinError')