From 34b5dc3298d3dce7f252158feb6d16691cf3b590 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 15 Dec 2014 12:09:57 -0300 Subject: [PATCH] If mobile app, import from a plain text backup --- js/controllers/import.js | 3 ++- js/controllers/importProfile.js | 3 ++- js/controllers/profile.js | 5 +++-- views/import.html | 4 ++-- views/importProfile.html | 4 ++-- views/modals/wallet-info.html | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/js/controllers/import.js b/js/controllers/import.js index 7089a1ccc..f0df43bee 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, $timeout, identityService, notification, isMobile, Compatibility) { + function($scope, $rootScope, $location, $timeout, identityService, notification, isMobile, isCordova, Compatibility) { $rootScope.title = 'Import wallet'; $scope.importStatus = 'Importing wallet - Reading backup...'; $scope.hideAdv = true; $scope.is_iOS = isMobile.iOS(); + $scope.isCordova = isCordova; $scope.importOpts = {}; window.ignoreMobilePause = true; diff --git a/js/controllers/importProfile.js b/js/controllers/importProfile.js index 4ea348626..bd9dd0361 100644 --- a/js/controllers/importProfile.js +++ b/js/controllers/importProfile.js @@ -1,11 +1,12 @@ 'use strict'; angular.module('copayApp.controllers').controller('ImportProfileController', - function($scope, $rootScope, $location, $timeout, notification, isMobile, identityService) { + function($scope, $rootScope, $location, $timeout, notification, isMobile, isCordova, identityService) { $scope.title = 'Import a backup'; $scope.importStatus = 'Importing wallet - Reading backup...'; $scope.hideAdv = true; $scope.is_iOS = isMobile.iOS(); + $scope.isCordova = isCordova; window.ignoreMobilePause = true; $scope.$on('$destroy', function() { diff --git a/js/controllers/profile.js b/js/controllers/profile.js index 58828bf0d..e38d57473 100644 --- a/js/controllers/profile.js +++ b/js/controllers/profile.js @@ -1,8 +1,8 @@ 'use strict'; -angular.module('copayApp.controllers').controller('ProfileController', function($scope, $rootScope, $location, $modal, $filter, $timeout, backupService, identityService, isMobile) { +angular.module('copayApp.controllers').controller('ProfileController', function($scope, $rootScope, $location, $modal, $filter, $timeout, backupService, identityService, isMobile, isCordova) { $scope.username = $rootScope.iden.getName(); $scope.isSafari = isMobile.Safari(); - $scope.isCordova = !!window.cordova; + $scope.isCordova = isCordova; $rootScope.title = 'Profile'; $scope.hideAdv = true; @@ -62,6 +62,7 @@ angular.module('copayApp.controllers').controller('ProfileController', function( var ModalInstanceCtrl = function($scope, $modalInstance) { if (!w) return; $scope.isSafari = isMobile.Safari(); + $scope.isCordova = isCordova; $scope.item = w; $scope.error = null; $scope.success = null; diff --git a/views/import.html b/views/import.html index 703aee06c..790cb08ae 100644 --- a/views/import.html +++ b/views/import.html @@ -22,14 +22,14 @@ -
+
Choose backup file from your computer
-
+
diff --git a/views/importProfile.html b/views/importProfile.html index f301a3709..f806f72b9 100644 --- a/views/importProfile.html +++ b/views/importProfile.html @@ -22,14 +22,14 @@
-
+
-
+