auto-organize fix

dashboard-ui/thirdparty/cordova/android/androidcredentials.js

@@ -30,62 +30,6 @@
         //initAjax();
     }
 
-    var baseAjaxMethod;
-    var currentId = 0;
-    function getNewRequestId() {
-        var id = currentId++;
-        return id.toString();
-    }
-    function initAjax() {
-        baseAjaxMethod = AjaxApi.ajax;
-        AjaxApi.ajax = sendRequest;
-    }
-
-    function sendRequest(request) {
-
-        if (request.data || request.contentType || request.dataType != 'json') {
-            return baseAjaxMethod(request);
-        }
-
-        var deferred = DeferredBuilder.Deferred();
-
-        var id = getNewRequestId();
-
-        request.headers = request.headers || {};
-
-        if (request.dataType == 'json') {
-            request.headers.accept = 'application/json';
-        }
-
-        var requestHeaders = [];
-        for (name in request.headers) {
-            requestHeaders.push(name + "=" + request.headers[name]);
-        }
-
-        ApiClientBridge.sendRequest(request.url, request.type, requestHeaders.join('|||||'), "window.AndroidAjax.onResponse", id);
-
-        Events.on(AndroidAjax, 'response' + id, function (e, status, response) {
-
-            Events.off(AndroidAjax, 'response' + id);
-
-            response = decodeURIComponent(response);
-
-            if (status >= 400) {
-                alert(status);
-                deferred.reject();
-            }
-            else if (request.dataType == 'json') {
-                deferred.resolveWith(null, [JSON.parse(response)]);
-            }
-            else {
-                deferred.resolveWith(null, [response]);
-            }
-
-        });
-
-        return deferred.promise();
-    }
-
     Events.on(ConnectionManager.credentialProvider(), 'credentialsupdated', updateCredentials);
 
     updateCredentials();

dashboard-ui/thirdparty/cordova/android/appstorage.js

@@ -0,0 +1,84 @@
+(function (globalScope, localStorage, sessionStorage) {
+
+    function myStore(defaultObject) {
+
+        var self = this;
+        self.localData = {};
+
+        var isDefaultAvailable;
+
+        if (defaultObject) {
+            try {
+                defaultObject.setItem('_test', '0');
+                isDefaultAvailable = true;
+            } catch (e) {
+
+            }
+        }
+
+        self.setItem = function (name, value) {
+
+            if (isDefaultAvailable) {
+                defaultObject.setItem(name, value);
+            } else {
+                self.localData[name] = value;
+            }
+        };
+
+        self.getItem = function (name) {
+
+            if (isDefaultAvailable) {
+                return defaultObject.getItem(name);
+            }
+
+            return self.localData[name];
+        };
+
+        self.removeItem = function (name) {
+
+            if (isDefaultAvailable) {
+                defaultObject.removeItem(name);
+            } else {
+                self.localData[name] = null;
+            }
+        };
+    }
+
+    function preferencesStore() {
+
+        var self = this;
+
+        self.setItem = function (name, value) {
+
+            AndroidSharedPreferences.set(name, value);
+        };
+
+        self.getItem = function (name) {
+
+            return AndroidSharedPreferences.get(name);
+        };
+
+        self.removeItem = function (name) {
+
+            AndroidSharedPreferences.remove(name);
+        };
+
+        function migrateKey(key) {
+            var json = localStorage.getItem(key);
+            if (json) {
+                self.setItem(key, json);
+                localStorage.removeItem(key);
+            }
+        }
+
+        function migrate() {
+            migrateKey('servercredentials3');
+        }
+
+        migrate();
+    }
+
+    globalScope.appStorage = new preferencesStore();
+    globalScope.sessionStore = new myStore(sessionStorage);
+
+})(window, window.localStorage, window.sessionStorage);