fix readfile on android

Author: skadefro

OpenFlow/src/public/CommonControllers.ts

@@ -32,12 +32,6 @@ module openflow {
                 this.gettoken();
                 // cleanup();
             });
-            // var cleanup2 = this.$rootScope.$on('cordovadetected', (event, data) => {
-            //     if (event && data) { }
-            //     console.log("cordovadetected, reload token");
-            //     this.gettoken();
-            //     cleanup2();
-            // });
             ['log', 'warn', 'debug', 'error'].forEach((methodName) => {
                 //['error2'].forEach((methodName) => {
                 const originalMethod = console[methodName];
@@ -325,12 +319,12 @@ module openflow {
     }
     export class JSONfn {
         public static stringify(obj) {
-            return JSON.stringify(obj, function (key, value) {
+            return JSON.stringify(obj, function(key, value) {
                 return (typeof value === 'function') ? value.toString() : value;
             });
         }
         public static parse(str) {
-            return JSON.parse(str, function (key, value) {
+            return JSON.parse(str, function(key, value) {
                 if (typeof value != 'string') return value;
                 return (value.substring(0, 8) == 'function') ? eval('(' + value + ')') : value;
             });
@@ -383,7 +377,7 @@ module openflow {
         return new Promise((resolve) => {
             try {
                 if (locale === null || locale === undefined) { return resolve(); }
-                locale.ready(lib).then(function () {
+                locale.ready(lib).then(function() {
                     var value = locale.getString(lib + "." + key);
                     if (value !== null && value !== undefined && value !== "") {
                         resolve(value);
@@ -425,15 +419,15 @@ module openflow {
             this.locale.ready(lib).then(() => {
                 var value: string = null;
                 if (ngModelCtrl !== null) {
-                    ngModelCtrl.$formatters.push(function (value) {
+                    ngModelCtrl.$formatters.push(function(value) {
                         return calculateValue(value);
                     });
                     // value = calculateValue(ngModelCtrl.$viewValue);
                     // ngModelCtrl.$setViewValue(this.result);
                     // ngModelCtrl.$render();
                 } else {
                     var hashCode = (s: string) => {
-                        return s.split("").reduce(function (a, b) { a = ((a << 5) - a) + b.charCodeAt(0); return a & a }, 0);
+                        return s.split("").reduce(function(a, b) { a = ((a << 5) - a) + b.charCodeAt(0); return a & a }, 0);
                     }
                     var watchFunction = () => {
                         if (attr.value !== null && attr.value !== undefined) {
@@ -542,7 +536,7 @@ module openflow {
         async DeleteOne(model: any): Promise<any> {
             this.loading = true;
             await this.api.Delete(this.collection, model);
-            this.models = this.models.filter(function (m: any): boolean { return m._id !== model._id; });
+            this.models = this.models.filter(function(m: any): boolean { return m._id !== model._id; });
             this.loading = false;
             if (!this.$scope.$$phase) { this.$scope.$apply(); }
         }

OpenFlow/src/public/WebSocketClient.ts

@@ -37,6 +37,7 @@ module openflow {
         public jwt: string = null;
         public device: any = null;
         public usingCordova: boolean = false;
+        public plugins: any = null;
         public scanCount: number = 0;
         public oneSignalId: string = null;
         public location: any;
@@ -45,7 +46,7 @@ module openflow {
         constructor(public $rootScope: ng.IRootScopeService, public $location, public $window: any) {
             try {
                 var path = this.$location.absUrl().split('#')[0];
-                this.usingCordova = (path.indexOf("/android/") > -1 || path.indexOf("/ios/") > -1);
+                // this.usingCordova = (path.indexOf("/android/") > -1 || path.indexOf("/ios/") > -1);
             } catch (error) {
             }
             this.init();
@@ -158,6 +159,7 @@ module openflow {
                     document.addEventListener("deviceready", async () => {
                         console.log("deviceready");
                         if ((window as any).plugins) {
+                            this.plugins = (window as any).plugins;
                             var oneSignal = (window as any).plugins.OneSignal;
                             if (oneSignal) {
                                 try {

VERSION

@@ -1 +1 @@
-0.0.280
+0.0.281