From 20b2f2d6dca454ebeee94b1f910b5f56d38e8aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 11 Oct 2016 17:10:00 -0300 Subject: [PATCH 1/2] force to use ionic prompt to hide password --- src/js/services/popupService.js | 2 +- src/js/services/walletService.js | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/js/services/popupService.js b/src/js/services/popupService.js index 9045c7b2b..6771d0e58 100644 --- a/src/js/services/popupService.js +++ b/src/js/services/popupService.js @@ -118,7 +118,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni this.showPrompt = function(title, message, opts, cb) { $log.warn(title + ": " + message); - if (isCordova) + if (isCordova && !opts.force) _cordovaPrompt(title, message, opts, cb); else _ionicPrompt(title, message, opts, cb); diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 0b0de6491..470d9c731 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -821,7 +821,8 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim // An alert dialog var askPassword = function(name, title, cb) { var opts = { - inputType: 'password' + inputType: 'password', + force: true }; popupService.showPrompt(title, name, opts, function(res) { if (!res) return cb(); @@ -961,7 +962,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim $rootScope.$emit('Local/TxAction', wallet.id); var type = root.getViewStatus(wallet, broadcastedTxp); - if(!customStatusHandler) { + if (!customStatusHandler) { root.openStatusModal(type, broadcastedTxp, function() {}); } @@ -972,7 +973,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim var type = root.getViewStatus(wallet, signedTxp); - if(!customStatusHandler) { + if (!customStatusHandler) { root.openStatusModal(type, signedTxp, function() {}); } From 99274519d671cdc8dd1741331c0c71a352470f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 12 Oct 2016 11:06:42 -0300 Subject: [PATCH 2/2] change option name --- src/js/services/popupService.js | 2 +- src/js/services/walletService.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/services/popupService.js b/src/js/services/popupService.js index 6771d0e58..486039a3b 100644 --- a/src/js/services/popupService.js +++ b/src/js/services/popupService.js @@ -118,7 +118,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni this.showPrompt = function(title, message, opts, cb) { $log.warn(title + ": " + message); - if (isCordova && !opts.force) + if (isCordova && !opts.forceHTMLPrompt) _cordovaPrompt(title, message, opts, cb); else _ionicPrompt(title, message, opts, cb); diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 470d9c731..27ce99500 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -822,7 +822,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim var askPassword = function(name, title, cb) { var opts = { inputType: 'password', - force: true + forceHTMLPrompt: true }; popupService.showPrompt(title, name, opts, function(res) { if (!res) return cb();