#302 - removed sqlite for Android (Seems to freeze for large text)

Former-commit-id: 53f73da59917fa6a8c171a559721ac04bb26a2e0

3 files changed, 42 insertions, 11 deletions

diff --git a/config.xml b/config.xml
index e264d4c6..614e0d88 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.9" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 72d4fc27..56f412c3 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -154,6 +154,7 @@ angular.module('zmApp.controllers')
                     val = val.replace(regex2, "<password removed>");
                 }
                 $fileLogger.debug(val);
+                console.log (val);
             }
         }
         
@@ -174,6 +175,7 @@ angular.module('zmApp.controllers')
                 //"username":"zmninja","password":"xyz",
                 //val = val.replace(/\"password:\",
                 $fileLogger.log(logtype, val);
+                console.log (val);
             }
         }
 
@@ -474,6 +476,8 @@ angular.module('zmApp.controllers')
                         decodedVal = val;
                     }
                     
+                    //decodedVal = val;
+                    
                     zmDebug ("user profile retrieved:"+JSON.stringify(decodedVal));
                     
                     $ionicLoading.hide();
diff --git a/www/js/app.js b/www/js/app.js
index 62ced60e..36bc255b 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1108,17 +1108,36 @@ angular.module('zmApp', [
             
             });
             
+            var order=[];
+            
+            if ($rootScope.platformOS == 'ios')
+            {
+                order =
+             [window.cordovaSQLiteDriver._driver,
+              localforage.INDEXEDDB,
+              localforage.WEBSQL,
+             localforage.LOCALSTORAGE];
+            }
+            
+            else
+                
+            {
+            // don't do SQL for non IOS - seems to hang?
+              order = [
+              
+              localforage.INDEXEDDB,
+              localforage.WEBSQL,
+              localforage.LOCALSTORAGE,          
+            ];
+                
+            }
+            
             localforage.defineDriver(window.cordovaSQLiteDriver).then(function () {
-                return localforage.setDriver([
+                return localforage.setDriver(
             // Try setting cordovaSQLiteDriver if available,
-              window.cordovaSQLiteDriver._driver,
-              // otherwise use one of the default localforage drivers as a fallback.
-              // This should allow you to transparently do your tests in a browser
-              localforage.LOCALSTORAGE,
-              localforage.INDEXEDDB,
-              localforage.WEBSQL
+             order
               
-            ]);
+            );
              }).then(function () {
                 // this should alert "cordovaSQLiteDriver" when in an emulator or a device
                 ZMDataModel.zmLog("localforage driver for storage:" + localforage.driver());
@@ -1149,7 +1168,7 @@ angular.module('zmApp', [
                         
                         
                         var dsn = defaultServerName;
-                        var dl = $localstorage.get('defaultLang');
+                        var dl = $localstorage.get('defaultLang') || 'en';
                         var ifu = ($localstorage.get('isFirstUse')=='0' ? false:true);
                         var luc = $localstorage.get('lastUpdateCheck');
                         var lbpc = $localstorage.get('latestBlogPostChecked');
@@ -1161,7 +1180,7 @@ angular.module('zmApp', [
                         ZMDataModel.zmLog ("is first use:"+ifu);
                         ZMDataModel.zmLog ("last update check:"+luc);
                         ZMDataModel.zmLog ("latest blog post check:"+lbpc);
-                        ZMDataModel.zmLog ("server group list:"+sgl);
+                        ZMDataModel.zmLog ("server group list:"+JSON.stringify(sgl));
 
                         localforage.setItem('defaultLang', dl)
                         .then (function() {
@@ -1181,7 +1200,10 @@ angular.module('zmApp', [
                         .then (function() {
                             ZMDataModel.zmLog (">>>>migrated latestBlogPostChecked...");
                             // lets encrypt serverGroupList
+                            ZMDataModel.zmLog ("server group list is " + JSON.stringify(sgl));
                             var ct = CryptoJS.AES.encrypt(JSON.stringify(sgl), zm.cipherKey);
+                            ZMDataModel.zmLog ("encrypted server group list is " + ct);
+                            ct = sgl;
                             return localforage.setItem('serverGroupList', ct);
                         })
                         .then (function() {
@@ -1193,6 +1215,11 @@ angular.module('zmApp', [
                             ZMDataModel.zmLog (">>>>Migrated all values, continuing...");
                             //ZMDataModel.migrationComplete();
                             continueInitialInit();
+                        })
+                        .catch (function(err)
+                        {
+                            ZMDataModel.zmLog ("Migration error : " + JSON.stringify(err));
+                            continueInitialInit();
                         });
                       
                     }