From 1af01a05ee5692f0af13e815acf171215cf869b7 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 27 Dec 2017 15:11:02 -0500 Subject: remove temp state if setLogin called - this was causing issues in android with eventserver settings blanking out --- www/js/DataModel.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'www/js/DataModel.js') diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 7b46f4ee..f9a294f9 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -384,6 +384,9 @@ angular.module('zmApp.controllers') function setLogin(newLogin) { //var d = $q.defer(); + // if we are here, we should remove cache + localforage.removeItem("settings-temp-data"); + loginData = angular.copy(newLogin); serverGroupList[loginData.serverName] = angular.copy(loginData); @@ -736,7 +739,7 @@ angular.module('zmApp.controllers') if (loginData.onTapScreen != $translate.instant('kTapMontage') && loginData.onTapScreen != $translate.instant('kTapEvents') && loginData.onTapScreen != $translate.instant('kTapLiveMonitor')) { - log("Invalid onTap setting found, resetting"); + log("Invalid onTap setting found, resetting. I got " + loginData.onTapScreen); loginData.onTapScreen = $translate.instant('kMontage'); } -- cgit v1.2.3