cordova-plugin-mserviceinterface-2.0 1.0.105 → 1.0.107

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.105",
+  "version": "1.0.107",
   "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.105">
+    xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mserviceinterface-2.0" version="1.0.107">
     <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

@@ -559,10 +559,7 @@ public class mInterfaceService extends Service implements com.google.android.gms
                                                 }
                                                 String[] fileName = queueFiles[queueIndex].toString().split("/");
                                                 String queueURL = clientUrl + "/common/components/QueueManager/QueueUpload.aspx?file_path=queue&client_id=" + clientID + "&country_code=" + countryCode + "&user_id=" + userID + "&file_name=" + fileName[fileName.length - 1];
-                                                statusIndication = new mInterfaceUtil().sendFilesToServer(queueFiles[queueIndex].toString(), fileName[fileName.length - 1], queueURL, () -> isCancelled() || !running);
-                                                if (statusIndication.equals("true")) {
-                                                    break;
-                                                }
+                                                new mInterfaceUtil().sendFilesToServer(queueFiles[queueIndex].toString(), fileName[fileName.length - 1], queueURL, () -> isCancelled() || !running);
                                             }
                                         }
                                     }

package/src/android/mInterfaceUtil.java

@@ -634,11 +634,7 @@ public class mInterfaceUtil {
                                         }
                                         String[] fileName = queueFiles[queueIndex].toString().split("/");
                                         String queueURL = clientUrl + "/common/components/QueueManager/QueueUpload.aspx?file_path=queue&client_id=" + clientID + "&country_code=" + countryCode + "&user_id=" + userID + "&file_name=" + fileName[fileName.length - 1];
-                                        statusIndication = sendFilesToServer(queueFiles[queueIndex].toString(), fileName[fileName.length - 1], queueURL);
-                                        if (statusIndication.equals("true")) {
-                                        breakIndication = "true";
-                                            break;
-                                        }
+                                        sendFilesToServer(queueFiles[queueIndex].toString(), fileName[fileName.length - 1], queueURL);
                                     }
                                 }
                             }

package/src/ios/mInterface.m

@@ -2358,7 +2358,6 @@
 - (void)StartService:(CDVInvokedUrlCommand*)command
 {
     @try {
-        [self KillTimers];
         [self ValidateAppStateInfo];
         self.QueueToServerTimer = [NSTimer scheduledTimerWithTimeInterval:5.0
                                                                    target:self
@@ -2368,7 +2367,7 @@
         double locationInterval = 0.0;
         NSString * directory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0];
         NSFileManager *fileManager = [NSFileManager defaultManager];
-        NSString *locConfgFilePath = [NSString stringWithFormat:@"%@/%@/app_controller.json", directory, [self GetAppName]];
+        NSString *locConfgFilePath = [NSString stringWithFormat:@"%@/%@/app_controller.json.txt", directory, [self GetAppName]];
         if([fileManager fileExistsAtPath:locConfgFilePath]){
             NSData *user_data = [NSData dataWithContentsOfFile:locConfgFilePath];
             NSError *jsonError = nil;
@@ -2382,32 +2381,25 @@
                     NSLog(@"No location update should not be happnened..");
                 } else {
                     self.locationManager = [[CLLocationManager alloc] init];
-                    self.locationManager.delegate = self;
-                    self.locationManager.distanceFilter = kCLDistanceFilterNone;
-                    self.locationManager.headingFilter  = kCLHeadingFilterNone;
-
-                    // Foreground-only: When In Use authorization
+                    [self.locationManager setDelegate:self];
+                    [self.locationManager setDistanceFilter:kCLDistanceFilterNone];
+                    [self.locationManager setHeadingFilter:kCLHeadingFilterNone];
+                    [self.locationManager requestAlwaysAuthorization];
+                    [self.locationManager requestWhenInUseAuthorization];
                     CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
-
-                    if (status == kCLAuthorizationStatusNotDetermined) {
-                        // First time: ask for When In Use
-                        [self.locationManager requestWhenInUseAuthorization];
-                    } else if (status == kCLAuthorizationStatusAuthorizedWhenInUse ||
-                               status == kCLAuthorizationStatusAuthorizedAlways) {
-                        // Permission already granted
-                        [self.locationManager startUpdatingLocation];
+                    if (status == kCLAuthorizationStatusAuthorizedAlways) {
+                        // Location permission is granted, enable background location updates
+                        if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 9) {
+                            _locationManager.allowsBackgroundLocationUpdates = YES;
+                        }
                     }
-
-                    // No allowsBackgroundLocationUpdates here
-
-                    
+                    [self.locationManager startUpdatingLocation];
+                    [self KillTimers];
                     self.LocationTimer = [NSTimer scheduledTimerWithTimeInterval:locationInterval
-                                                                          target:self
+                                                                        target:self
                                                                         selector:@selector(SendLocation)
                                                                         userInfo:nil
-                                                                         repeats:YES];
-                    [self.LocationTimer fire];
-
+                                                                        repeats:YES];
                 }
                 } else {
                     NSLog(@"'location_configuration' key not found in JSON.");
@@ -2513,11 +2505,7 @@
                                 for( int queueIndex = 0; queueIndex < [queueFilesMutArr count]; queueIndex++ ) {
                                     NSString *queueFilesPath = [NSString stringWithFormat:@"%@/%@", queueFolderPath, queueFilesMutArr[queueIndex]];
                                     NSString *queueURL = [NSString stringWithFormat:@"%@/common/components/QueueManager/QueueUpload.aspx?file_path=queue&client_id=%@&country_code=%@&user_id=%@&file_name=%@", clientUrl, clientId, countryCode, userID, queueFilesMutArr[queueIndex]];
-                                    statusIndication = [self sendFilesToServer:queueFilesPath fileName:queueFilesMutArr[queueIndex] requestURL:queueURL];
-                                    if ([statusIndication isEqualToString:@"true"]) {
-                                        breakIndication = @"true";
-                                        break;
-                                    }
+                                    [self sendFilesToServer:queueFilesPath fileName:queueFilesMutArr[queueIndex] requestURL:queueURL];
                                 }
                             }
                         } else {
@@ -2606,10 +2594,7 @@
                                 for( int queueIndex = 0; queueIndex < [queueFilesMutArr count]; queueIndex++ ) {
                                     NSString *queueFilesPath = [NSString stringWithFormat:@"%@/%@", queueFolderPath, queueFilesMutArr[queueIndex]];
                                     NSString *queueURL = [NSString stringWithFormat:@"%@/common/components/QueueManager/QueueUpload.aspx?file_path=queue&client_id=%@&country_code=%@&user_id=%@&file_name=%@", clientUrl, clientId, countryCode, userID, queueFilesMutArr[queueIndex]];
-                                    statusIndication = [self sendFilesToServer:queueFilesPath fileName:queueFilesMutArr[queueIndex] requestURL:queueURL];
-                                     if ([statusIndication isEqualToString:@"true"]) {
-                                        break;
-                                    }
+                                    [self sendFilesToServer:queueFilesPath fileName:queueFilesMutArr[queueIndex] requestURL:queueURL];
                                 }
                             }
                         } else {
@@ -3282,43 +3267,33 @@
 
 - (void)OpenFileWithViewer:(CDVInvokedUrlCommand *)command {
     self.fileOpenCallbackId = command.callbackId;
-    
-    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(), ^{
+    [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;
                 QLPreviewController *previewCtrl = [[QLPreviewController alloc] init];
                 previewCtrl.delegate = self;
                 previewCtrl.dataSource = self;
                 [previewCtrl.navigationItem setRightBarButtonItem:nil];
-
-                [self.viewController presentViewController:previewCtrl
-                                                  animated:YES
-                                                completion:nil];
-            });
-
-            commandResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
-                                               messageAsString:@"Success"];
-            [commandResult setKeepCallback:@(YES)];
+                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"];
+            }
         } else {
-            NSLog(@"Invalid file URL: %@", err);
-            commandResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
-                                               messageAsString:@"Invalid file URL"];
+            NSLog(@"Missing URL argument");
+            commandResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Missing URL argument"];
         }
-    } else {
-        NSLog(@"Missing URL argument");
-        commandResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
-                                           messageAsString:@"Missing URL argument"];
-    }
-
-    [self.commandDelegate sendPluginResult:commandResult callbackId:command.callbackId];
+        [self.commandDelegate sendPluginResult:commandResult callbackId:command.callbackId];
+    }];
 }
 
 #pragma - QLPreviewControllerDataSource Protocol