From e19185139e15d173a6f65443ba204b81482861db Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 7 Oct 2014 16:37:22 -0300 Subject: [PATCH] Import backup from a plain text only for iOS --- css/src/main.css | 1 + js/controllers/import.js | 13 +++++++------ views/import.html | 20 +++++++++++++++++--- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index efae2e357..d0a1881d3 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -167,6 +167,7 @@ a:hover { .join input, .setup input, .import input, +.import textarea, .settings input { background: #2C3E50 !important; -moz-box-shadow: inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important; diff --git a/js/controllers/import.js b/js/controllers/import.js index 58b3227f9..4c10279e4 100644 --- a/js/controllers/import.js +++ b/js/controllers/import.js @@ -1,12 +1,13 @@ 'use strict'; angular.module('copayApp.controllers').controller('ImportController', - function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification) { + function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification, isMobile) { controllerUtils.redirIfLogged(); $scope.title = 'Import a backup'; $scope.importStatus = 'Importing wallet - Reading backup...'; $scope.hideAdv = true; + $scope.is_iOS = isMobile.iOS(); var reader = new FileReader(); @@ -69,10 +70,6 @@ angular.module('copayApp.controllers').controller('ImportController', $scope.choosefile = !$scope.choosefile; }; - $scope.openPasteArea = function() { - $scope.pastetext = !$scope.pastetext; - }; - $scope.getFile = function() { // If we use onloadend, we need to check the readyState. reader.onloadend = function(evt) { @@ -93,9 +90,10 @@ angular.module('copayApp.controllers').controller('ImportController', } var backupFile = $scope.file; + var backupText = form.backupText.$modelValue; var password = form.password.$modelValue; - if (!backupFile) { + if (!backupFile && !backupText) { $scope.loading = false; notification.error('Error', 'Please, select your backup file'); $scope.loading = false; @@ -105,5 +103,8 @@ angular.module('copayApp.controllers').controller('ImportController', if (backupFile) { reader.readAsBinaryString(backupFile); } + else { + _importBackup(backupText); + } }; }); diff --git a/views/import.html b/views/import.html index d88c49353..60515968f 100644 --- a/views/import.html +++ b/views/import.html @@ -15,9 +15,23 @@

{{title|translate}}

- Choose backup file from your computer - +
+ + Choose backup file from your computer + + +
+ +
+ + +