cordova-plugin-mserviceinterface-2.0 1.0.28 → 1.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.28",
+  "version": "1.0.32",
   "description": "This plugin establishes the connection to the native interface and performs the requested task.",
   "main": "index.js",
   "scripts": {
@@ -25,4 +25,4 @@
       "version": ">=5.0.0"
     }
   ]
-}
+}

package/plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-plugin-mserviceinterface-2.0"
-    version="1.0.28">
+    version="1.0.32">
     <name>mserviceinterface-2.0</name>
     <description>This plugin establishes the connection to the native interface and performs the requested task.</description>
     <author>selfservit@gmail.com</author>

package/src/android/mInterfaceService.java

@@ -208,16 +208,19 @@ public class mInterfaceService extends Service implements com.google.android.gms
                                 }
                             }
                         };
-                        setLocationTimeInterval = new Timer();
-                        setLocationTimeInterval.schedule(timerTask, Integer.parseInt(serverDateObj.optString("location_fetch_interval_in_seconds")), Integer.parseInt(serverDateObj.optString("location_fetch_interval_in_seconds")));
-                        MINIMUM_INTERVAL = Long.parseLong(serverDateObj.optString("location_fetch_interval_in_seconds").toString());
-                        createLocationRequest();
-                        this.mGoogleApiClient = new GoogleApiClient.Builder(this)
-                                .addConnectionCallbacks(this)
-                                .addOnConnectionFailedListener(this)
-                                .addApi(LocationServices.API)
-                                .build();
-                        mGoogleApiClient.connect();
+                        if(setLocationTimeInterval == null){
+                            setLocationTimeInterval = new Timer();
+                            setLocationTimeInterval.schedule(timerTask, Integer.parseInt(serverDateObj.optString("location_fetch_interval_in_seconds")), Integer.parseInt(serverDateObj.optString("location_fetch_interval_in_seconds")));
+                            MINIMUM_INTERVAL = Long.parseLong(serverDateObj.optString("location_fetch_interval_in_seconds").toString());
+                            createLocationRequest();
+                            this.mGoogleApiClient = new GoogleApiClient.Builder(this)
+                                    .addConnectionCallbacks(this)
+                                    .addOnConnectionFailedListener(this)
+                                    .addApi(LocationServices.API)
+                                    .build();
+                            mGoogleApiClient.connect();
+                        };
+
                     }
                 }
             } else {

package/src/ios/mInterface.m

@@ -10,8 +10,6 @@
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include "TargetConditionals.h"
-#import "OneSignalPush.h"
-#import <OneSignal/OneSignal.h>
 #import <objc/runtime.h>
 
 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
@@ -29,15 +27,6 @@
 @synthesize controller = docController;
 @synthesize callbackID;
 
-- (void)GetFCMUtils:(CDVInvokedUrlCommand *)command {
-    OSDeviceState *deviceState = [OneSignal getDeviceState];
-    NSMutableDictionary * deviceDict = [[NSMutableDictionary alloc] init];
-    [deviceDict setValue:deviceState.userId forKey:@"userId"];
-    [deviceDict setValue:deviceState.pushToken forKey:@"pushToken"];
-    CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:deviceDict];
-    [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
-}
-
 -(void)GetBase64String:(CDVInvokedUrlCommand *)command {
     NSMutableDictionary *dict = [[command arguments] objectAtIndex:0];
     NSString *directory = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)[0];
@@ -372,6 +361,7 @@
 
 - (void)GetSubDirectoryList:(CDVInvokedUrlCommand *)command {
     BOOL isDir;
+    NSString *resultString = @"";
     NSMutableDictionary * dict = [[command arguments] objectAtIndex:0];
     NSString *directory = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)[0];
     NSString *contentsPath = [NSString stringWithFormat:@"%@/%@", directory, dict[@"filePath"]];
@@ -381,16 +371,23 @@
         [contenstMutableArray removeObject:@".DS_Store"];
     }
     for(int index = 0; index < [contenstMutableArray count]; index++) {
-        if (![[NSFileManager defaultManager] fileExistsAtPath:[contentsPath stringByAppendingPathComponent:contenstMutableArray[index]] isDirectory:&isDir] && isDir) {
-            [contenstMutableArray removeObject:contenstMutableArray[index]];
+        if ([[NSFileManager defaultManager] fileExistsAtPath:[contentsPath stringByAppendingPathComponent:contenstMutableArray[index]] isDirectory:&isDir] && isDir) {
+            if ([resultString isEqualToString:@""]) {
+                resultString = [resultString stringByAppendingString:contenstMutableArray[index]];
+            }
+            else {
+                resultString = [resultString stringByAppendingString:@"|"];
+                resultString = [resultString stringByAppendingString:contenstMutableArray[index]];
+            }
         }
     }
-    CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:contenstMutableArray];
+    CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:resultString];
     [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
 }
 
 - (void)GetFileList:(CDVInvokedUrlCommand *)command {
     BOOL isDir;
+    NSString *resultString = @"";
     NSMutableDictionary * dict = [[command arguments] objectAtIndex:0];
     NSString *directory = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)[0];
     NSString *contentsPath = [NSString stringWithFormat:@"%@/%@", directory, dict[@"filePath"]];
@@ -400,11 +397,17 @@
         [contenstMutableArray removeObject:@".DS_Store"];
     }
     for(int index = 0; index < [contenstMutableArray count]; index++) {
-        if ([[NSFileManager defaultManager] fileExistsAtPath:[contentsPath stringByAppendingPathComponent:contenstMutableArray[index]] isDirectory:&isDir] && isDir) {
-            [contenstMutableArray removeObject:contenstMutableArray[index]];
+        if ([[NSFileManager defaultManager] fileExistsAtPath:[contentsPath stringByAppendingPathComponent:contenstMutableArray[index]] isDirectory:&isDir] && !isDir) {
+            if ([resultString isEqualToString:@""]) {
+                resultString = [resultString stringByAppendingString:contenstMutableArray[index]];
+            }
+            else {
+                resultString = [resultString stringByAppendingString:@"|"];
+                resultString = [resultString stringByAppendingString:contenstMutableArray[index]];
+            }
         }
     }
-    CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:contenstMutableArray];
+    CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:resultString];
     [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
 }