From 736002099098b9e044000dd02f359182c4043ef8 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 29 Sep 2018 16:47:06 -0400
Subject: certificate fixes

---
 www/js/DataModel.js        | 2 +-
 www/js/EventModalCtrl.js   | 6 ++++--
 www/js/MenuController.js   | 2 +-
 www/js/MonitorModalCtrl.js | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'www')

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index f400259d..5b49aa88 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -20,7 +20,7 @@ angular.module('zmApp.controllers')
         DO NOT TOUCH zmAppVersion
         It is changed by sync_version.sh
       */
-      var zmAppVersion = "1.3.022";
+      var zmAppVersion = "1.3.026";
       var isBackground = false;
       var justResumed = false;
       var timeSinceResumed = -1;
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 422b66b9..68d378dc 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -930,6 +930,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     var fname = "zmninja.jpg";
     var fn = "cordova.plugins.photoLibrary.saveImage";
+    var loginData = NVRDataModel.getLogin();
 
     $ionicLoading.show({
       template: $translate.instant('kPleaseWait') + "...",
@@ -1012,8 +1013,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
             },
             function (err) {
-              console.log("error downloading:" + JSON.stringify(err));
-            }, false, {});
+              NVRDataModel.log("error downloading:" + JSON.stringify(err));
+              SaveError();
+            }, !loginData.enableStrictSSL, {});
 
 
 
diff --git a/www/js/MenuController.js b/www/js/MenuController.js
index 1ab7a6fa..52ab51ac 100644
--- a/www/js/MenuController.js
+++ b/www/js/MenuController.js
@@ -91,7 +91,7 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
         cordova.plugin.http.useBasicAuth(loginData.basicAuthUser, loginData.basicAuthPassword);
       }
 
-      if (loginData.enableStrictSSL) {
+      if (!loginData.enableStrictSSL) {
 
         //alert("Enabling insecure SSL");
         NVRDataModel.log(">>>> Disabling strict SSL checking (turn off  in Dev Options if you can't connect)");
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js
index 5bb8952a..ad26e96a 100644
--- a/www/js/MonitorModalCtrl.js
+++ b/www/js/MonitorModalCtrl.js
@@ -1220,7 +1220,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
                   });
           
           }, 
-            function(err) { console.log ("error downloading:"+JSON.stringify(err));}, false, {});
+            function(err) { NVRDataModel.debug ("error downloading:"+JSON.stringify(err));SaveError();}, !loginData.enableStrictSSL, {});
 
 
             
-- 
cgit v1.2.3