diff options
| -rwxr-xr-x | www/js/DataModel.js | 31 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 10 | ||||
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 12 | ||||
| -rwxr-xr-x | www/js/app.js | 2 |
4 files changed, 48 insertions, 7 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 12e90ab3..57215c2c 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -167,6 +167,8 @@ angular.module('zmApp.controllers') 'enableGIFMP4': false, 'enableStrictSSL': false, 'enableSlowLoading': false, + 'isFullScreen': false, + 'reloadInMontage': false, }; @@ -370,22 +372,28 @@ angular.module('zmApp.controllers') function setLogin(newLogin) { + //var d = $q.defer(); + loginData = angular.copy(newLogin); serverGroupList[loginData.serverName] = angular.copy(loginData); var ct = CryptoJS.AES.encrypt(JSON.stringify(serverGroupList), zm.cipherKey).toString(); + return localforage.setItem("serverGroupList", ct) + .then (function() { return localforage.setItem("defaultServerName", loginData.serverName);}) + .catch ( function (err) {log("localforage store error " + JSON.stringify(err));}); //console.log ("****serverLogin was encrypted to " + ct); //$localstorage.setObject("serverGroupList", serverGroupList); - localforage.setItem("serverGroupList", ct, function(err) + /* return localforage.setItem("serverGroupList", ct, function(err) { if (err) log("localforage store error " + JSON.stringify(err)); }); //$localstorage.set("defaultServerName", loginData.serverName); - localforage.setItem("defaultServerName", loginData.serverName, function(err) + return localforage.setItem("defaultServerName", loginData.serverName, function(err) { if (err) log("localforage store error " + JSON.stringify(err)); - }); + });*/ + // return (d.promise); } @@ -920,6 +928,20 @@ angular.module('zmApp.controllers') } + if (typeof loginData.isFullScreen == 'undefined') + { + + loginData.isFullScreen = false; + + } + + if (typeof loginData.reloadInMontage == 'undefined') + { + + loginData.reloadInMontage = false; + + } + if (typeof loginData.soundOnPush == 'undefined') { debug("sound on push not found, setting to true"); @@ -1319,8 +1341,9 @@ angular.module('zmApp.controllers') setLogin: function(newLogin) { - setLogin(newLogin); $rootScope.showBlog = newLogin.enableBlog; + return setLogin(newLogin); + }, diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 46b8f83e..ed45c63a 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -141,8 +141,16 @@ angular.module('zmApp.controllers') } + var ld = NVRDataModel.getLogin(); + ld.reloadInMontage = true; NVRDataModel.log ("Reloading view to keep memory in check..."); - $window.location.reload(); + NVRDataModel.setLogin(ld) + .then (function() {$window.location.reload();}); + + + + + /*$ionicHistory.nextViewOptions( { disableAnimate: true, 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)); diff --git a/www/js/app.js b/www/js/app.js index 0bca8099..d1561373 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -102,7 +102,7 @@ angular.module('zmApp', [ maxGifWidth: 800.0, quantSample: 15, hashSecret: 'unused at the moment', - forceMontageReloadDelay: 3600 // 1 hr + forceMontageReloadDelay: 30 //3600 // 1 hr }) |