summaryrefslogtreecommitdiff
path: root/www/js/DataModel.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-09-22 13:28:05 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-09-22 13:28:05 -0400
commit1c544b656e47d8b8ddba19673daba07a35e3afb2 (patch)
treef6640f2025b4e0ae034eddf41396d4615e6fcf1f /www/js/DataModel.js
parent39320d2e7c2f2dfc318f921ee615e0165c418f4a (diff)
various fixes for XCode 10 build process and iCloud
Diffstat (limited to 'www/js/DataModel.js')
-rw-r--r--www/js/DataModel.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 8b282aee..575f369c 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.020";
+ var zmAppVersion = "1.3.022";
var isBackground = false;
var justResumed = false;
var timeSinceResumed = -1;
@@ -895,10 +895,12 @@ angular.module('zmApp.controllers')
log("Did not find a valid local configuration, trying cloud...");
window.cordova.plugin.cloudsettings.exists(function (exists) {
- log ("A cloud configuration has been found");
+
if (exists) {
+ log ("A cloud configuration has been found");
window.cordova.plugin.cloudsettings.load(function (cloudData) {
console.log ("CLOUD DATA FOUND"+JSON.stringify(cloudData));
+ debug ("Cloud data retrieved is:"+JSON.stringify(cloudData));
if (cloudData && cloudData.defaultServerName && cloudData.serverGroupList) {
log("retrieved a valid cloud config with a defaultServerName of:"+cloudData.defaultServerName);
log("replacing local DB with cloud...");