From 24677360c6364221e6701908734ad15f44e7a26e Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 5 Nov 2017 19:29:59 -0500 Subject: #555 - make sure fingerprint auth is not called if auto montage reload --- www/js/PortalLoginCtrl.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'www/js/PortalLoginCtrl.js') diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index 6970fc9e..a71aa83e 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -33,8 +33,18 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic // You can login either via touch ID or typing in your code + var ld = NVRDataModel.getLogin(); - if ($ionicPlatform.is('android') && loginData.usePin) { + if (ld.reloadInMontage == true) { + // we are in montage reload, so don't re-auth + NVRDataModel.log ("skipping validation, as this is montage reload"); + ld.reloadInMontage = false; + NVRDataModel.setLogin(ld); + unlock(true); + + } + + else if ($ionicPlatform.is('android') && loginData.usePin) { FingerprintAuth.isAvailable(function (result) { console.log("FingerprintAuth available: " + JSON.stringify(result)); -- cgit v1.2.3