cordova-plugin-mserviceinterface-2.0 1.0.95 → 1.0.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.95",
+  "version": "1.0.97",
   "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.95">
+    xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mserviceinterface-2.0" version="1.0.97">
     <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
@@ -2367,7 +2368,7 @@
         double locationInterval = 0.0;
         NSString * directory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0];
         NSFileManager *fileManager = [NSFileManager defaultManager];
-        NSString *locConfgFilePath = [NSString stringWithFormat:@"%@/%@/app_controller.json.txt", directory, [self GetAppName]];
+        NSString *locConfgFilePath = [NSString stringWithFormat:@"%@/%@/app_controller.json", directory, [self GetAppName]];
         if([fileManager fileExistsAtPath:locConfgFilePath]){
             NSData *user_data = [NSData dataWithContentsOfFile:locConfgFilePath];
             NSError *jsonError = nil;
@@ -2381,25 +2382,32 @@
                     NSLog(@"No location update should not be happnened..");
                 } else {
                     self.locationManager = [[CLLocationManager alloc] init];
-                    [self.locationManager setDelegate:self];
-                    [self.locationManager setDistanceFilter:kCLDistanceFilterNone];
-                    [self.locationManager setHeadingFilter:kCLHeadingFilterNone];
-                    [self.locationManager requestAlwaysAuthorization];
-                    [self.locationManager requestWhenInUseAuthorization];
+                    self.locationManager.delegate = self;
+                    self.locationManager.distanceFilter = kCLDistanceFilterNone;
+                    self.locationManager.headingFilter  = kCLHeadingFilterNone;
+
+                    // Foreground-only: When In Use authorization
                     CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
-                    if (status == kCLAuthorizationStatusAuthorizedAlways) {
-                        // Location permission is granted, enable background location updates
-                        if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 9) {
-                            _locationManager.allowsBackgroundLocationUpdates = YES;
-                        }
+
+                    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];
                     }
-                    [self.locationManager startUpdatingLocation];
-                    [self KillTimers];
+
+                    // No allowsBackgroundLocationUpdates here
+
+                    
                     self.LocationTimer = [NSTimer scheduledTimerWithTimeInterval:locationInterval
-                                                                        target:self
+                                                                          target:self
                                                                         selector:@selector(SendLocation)
                                                                         userInfo:nil
-                                                                        repeats:YES];
+                                                                         repeats:YES];
+                    [self.LocationTimer fire];
+
                 }
                 } else {
                     NSLog(@"'location_configuration' key not found in JSON.");