cordova-plugin-mserviceinterface-2.0 1.0.96 → 1.0.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.96",
+  "version": "1.0.98",
   "description": "This plugin establishes the connection to the native interface and performs the requested task.",
   "main": "index.js",
   "scripts": {

package/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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.96">
+    xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mserviceinterface-2.0" version="1.0.98">
     <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/ios/mInterface.m

@@ -2358,6 +2358,7 @@
 - (void)StartService:(CDVInvokedUrlCommand*)command
 {
     @try {
+        [self KillTimers];
         [self ValidateAppStateInfo];
         self.QueueToServerTimer = [NSTimer scheduledTimerWithTimeInterval:5.0
                                                                    target:self
@@ -2399,7 +2400,7 @@
 
                     // No allowsBackgroundLocationUpdates here
 
-                    [self KillTimers];
+                    
                     self.LocationTimer = [NSTimer scheduledTimerWithTimeInterval:locationInterval
                                                                           target:self
                                                                         selector:@selector(SendLocation)
@@ -3274,33 +3275,43 @@
 
 - (void)OpenFileWithViewer:(CDVInvokedUrlCommand *)command {
     self.fileOpenCallbackId = command.callbackId;
-    [self.commandDelegate runInBackground:^{
-        CDVPluginResult* commandResult = nil;
-        NSString *filePath = [command.arguments objectAtIndex:0];
-        if (filePath != nil && [filePath length] > 0) {
-            NSURL *url = [NSURL URLWithString:filePath];
-            NSError *err;
-            if (url.isFileURL && [url checkResourceIsReachableAndReturnError:&err] == YES) {
-                self.fileUrl = url;
+    
+    CDVPluginResult *commandResult = nil;
+    NSString *filePath = [command.arguments objectAtIndex:0];
+
+    if (filePath != nil && [filePath length] > 0) {
+        NSURL *url = [NSURL URLWithString:filePath];
+
+        NSError *err = nil;
+        if (url.isFileURL && [url checkResourceIsReachableAndReturnError:&err]) {
+            self.fileUrl = url;
+
+            dispatch_async(dispatch_get_main_queue(), ^{
                 QLPreviewController *previewCtrl = [[QLPreviewController alloc] init];
                 previewCtrl.delegate = self;
                 previewCtrl.dataSource = self;
                 [previewCtrl.navigationItem setRightBarButtonItem:nil];
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    [self.viewController presentViewController:previewCtrl animated:YES completion:nil];
-                });
-                commandResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:@"Success"];
-                [commandResult setKeepCallback:[NSNumber numberWithBool:YES]];
-            } else {
-                NSLog(@"Invalid file URL");
-                commandResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Invalid file URL"];
-            }
+
+                [self.viewController presentViewController:previewCtrl
+                                                  animated:YES
+                                                completion:nil];
+            });
+
+            commandResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
+                                               messageAsString:@"Success"];
+            [commandResult setKeepCallback:@(YES)];
         } else {
-            NSLog(@"Missing URL argument");
-            commandResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Missing URL argument"];
+            NSLog(@"Invalid file URL: %@", err);
+            commandResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
+                                               messageAsString:@"Invalid file URL"];
         }
-        [self.commandDelegate sendPluginResult:commandResult callbackId:command.callbackId];
-    }];
+    } else {
+        NSLog(@"Missing URL argument");
+        commandResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
+                                           messageAsString:@"Missing URL argument"];
+    }
+
+    [self.commandDelegate sendPluginResult:commandResult callbackId:command.callbackId];
 }
 
 #pragma - QLPreviewControllerDataSource Protocol