diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2017-02-17 09:34:26 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2017-02-17 09:34:26 -0500 |
| commit | 4f24f51a5eb31c3c1e93ecbbc65111b0c037ff29 (patch) | |
| tree | 0c8ecdae8c9e20b67f55c6aa67af3e5d57c56b99 /www/js/app.js | |
| parent | 9259570206df3033c40fdb1f753d53911f8e0358 (diff) | |
android and iOS ports now allow for strict SSL checks via setting in dev options. DO NOT ENABLE with self signed certs #455
Diffstat (limited to 'www/js/app.js')
| -rwxr-xr-x | www/js/app.js | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/www/js/app.js b/www/js/app.js index d0f30afe..b006390a 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -1485,6 +1485,8 @@ angular.module('zmApp', [ $ionicPlatform.ready(function() { + + // handles URL launches // if you just launch zmninja:// then it will honor the settings in "tap screen" -> events or montage @@ -1694,8 +1696,7 @@ angular.module('zmApp', [ { $cordovaSplashscreen.hide(); - NVRDataModel.log("Enabling insecure SSL"); - cordova.plugins.certificates.trustUnsecureCerts(true); + cordova.getAppVersion.getVersionNumber().then(function(version) { @@ -1819,6 +1820,10 @@ angular.module('zmApp', [ { NVRDataModel.log("Language file loaded, continuing with rest"); NVRDataModel.init(); + + // now do SSL check + //setSSLCerts(); + EventServer.init(); zmCheckUpdates.start(); NVRDataModel.log("Setting up POST LOGIN timer"); @@ -1826,10 +1831,12 @@ angular.module('zmApp', [ setupPauseAndResume(); + } } + function setupPauseAndResume() { NVRDataModel.log("Setting up pause and resume handler AFTER language is loaded..."); @@ -2193,7 +2200,7 @@ angular.module('zmApp', [ { data: { - requireLogin: true + requireLogin: false }, url: "/devoptions", cache: false, |