diff options
| -rw-r--r-- | config.xml | 8 | ||||
| -rw-r--r-- | package.json | 8 | ||||
| -rw-r--r-- | www/js/LoginCtrl.js | 12 | ||||
| -rw-r--r-- | www/js/MenuController.js | 13 | ||||
| -rw-r--r-- | www/js/NVR.js | 3 |
5 files changed, 34 insertions, 10 deletions
@@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.079" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.080" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>zmNinja</name> <description> High performance ZoneMinder client @@ -176,10 +176,10 @@ <plugin name="cordova-plugin-photo-library" spec="https://github.com/pliablepixels/cordova-plugin-photo-library"> <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value=" " /> </plugin> - <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git"> - <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" /> - </plugin> <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" /> <engine name="ios" spec="4.5.5" /> <engine name="android" spec="8.0.0" /> + <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git"> + <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" /> + </plugin> </widget> diff --git a/package.json b/package.json index 93306d8e..90e9bcf2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version": "1.3.079", + "version":"1.3.080", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -58,10 +58,10 @@ "cordova-plugin-photo-library": { "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save monitor photos to albums" }, + "cordova-plugin-media-pp-fork": {}, "cordova-plugin-ionic-webview": { "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" - }, - "cordova-plugin-media-pp-fork": {} + } } }, "dependencies": { @@ -191,4 +191,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index cd6861a8..11474f2d 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -594,6 +594,18 @@ function mobilePinConfig () { function saveItems(showalert) { + NVR.flushAPICache() + .then (function() { + _saveItems(showalert); + }) + .catch (function(err) { + NVR.debug ('Error clearing cache:'+JSON.stringify(err)); + _saveItems(showalert); + }); + + } + function _saveItems(showalert) { + //console.log ("*********** SAVE ITEMS CALLED "); //console.log('Saving login'); diff --git a/www/js/MenuController.js b/www/js/MenuController.js index 92aca6da..781fb21e 100644 --- a/www/js/MenuController.js +++ b/www/js/MenuController.js @@ -384,7 +384,18 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io } if (NVR.getLogin().serverName != $scope.newServer.val) - switchToServer($scope.newServer.val); + { + NVR.flushAPICache() + .then (function() { + switchToServer($scope.newServer.val); + }) + .catch (function(err) { + NVR.debug ('Error clearing cache:'+JSON.stringify(err)); + switchToServer($scope.newServer.val); + }); + } + + //$rootScope.$broadcast('server-changed'); diff --git a/www/js/NVR.js b/www/js/NVR.js index eb3ba08e..0d1a9bd2 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -21,7 +21,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.079"; + var zmAppVersion = "1.3.080"; var zmAPIVersion = null; var isBackground = false; var justResumed = false; @@ -349,6 +349,7 @@ angular.module('zmApp.controllers') } function delete_all_caches() { + debug ('CACHE: Flushing all network API caches...'); return localforage.removeItem('cached_monitors') .then ( function () {return localforage.removeItem('cached_api_version');}) .then ( function () {return localforage.removeItem('cached_multi_servers');}) |