cordova-plugin-mserviceinterface-2.0 1.0.52 → 1.0.54

package/package.json

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

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.52">
+    version="1.0.54">
     <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/mInterface.java

@@ -2105,7 +2105,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
         return false;
     }
 
-    private void EnableGPSAutoMatically(CallbackContext callbackContext) {
+    private void EnableGPSAutomatically(CallbackContext callbackContext) {
         callback = callbackContext;
         createLocationRequest1();
         mGoogleApiClient1 = new GoogleApiClient.Builder(cordova.getActivity())

package/src/ios/mInterface.m

@@ -937,9 +937,12 @@
         [self.locationManager setHeadingFilter:kCLHeadingFilterNone];
         [self.locationManager requestAlwaysAuthorization];
         [self.locationManager requestWhenInUseAuthorization];
-        // Allow background Update
-        if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 9) {
-            _locationManager.allowsBackgroundLocationUpdates = YES;
+        CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
+        if (status == kCLAuthorizationStatusAuthorizedAlways) {
+            // Location permission is granted, enable background location updates
+            if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 9) {
+                _locationManager.allowsBackgroundLocationUpdates = YES;
+            }
         }
         [self.locationManager startUpdatingLocation];
         double lat = self.locationManager.location.coordinate.latitude;
@@ -1015,13 +1018,12 @@
             if(networkStatus == NotReachable){
             } else {
                 NSError *error;
-                NSArray *myAccountsArray = [NSJSONSerialization JSONObjectWithData:[[NSString stringWithContentsOfFile:[NSString stringWithFormat:@"%@/%@/my_accounts.txt", directory, [self GetAppName]] encoding:NSUTF8StringEncoding error:&error] dataUsingEncoding:NSUTF8StringEncoding] options: NSJSONReadingMutableContainers error:&error];
+                NSArray *myAccountsArray = [NSJSONSerialization JSONObjectWithData:[[NSString stringWithContentsOfFile:[NSString stringWithFormat:@"%@/%@/my_accounts_encrypted.txt", directory, [self GetAppName]] encoding:NSUTF8StringEncoding error:&error] dataUsingEncoding:NSUTF8StringEncoding] options: NSJSONReadingMutableContainers error:&error];
                 for( int index = 0; index < [myAccountsArray count]; index++ ) {
                     NSString *locationUpdateInd = [myAccountsArray[index] valueForKey:@"location_update_ind"];
                     if([locationUpdateInd isEqual: @"true"]) {
                         NSString *clientId = [myAccountsArray[index] valueForKey:@"client_id"];
                         NSString *countryCode = [myAccountsArray[index] valueForKey:@"country_code"];
-                        NSString *deviceID = [myAccountsArray[index] valueForKey:@"device_id"];
                         NSString *clientUrl = [myAccountsArray[index] valueForKey:@"client_url"];
                         NSString *locationData = [NSString stringWithContentsOfFile:locationFilePath encoding:NSUTF8StringEncoding error:&error];
                         NSString *baseURL = [NSString stringWithFormat:@"%@/common/components/GeoLocation/update_device_location_offline.aspx", clientUrl];
@@ -1031,7 +1033,12 @@
                         [request setValue:@"text/xml" forHTTPHeaderField:@"Content-type"];
                         [request setHTTPMethod : @"POST"];
                         [request setHTTPBody : inputData];
-                        [NSURLConnection connectionWithRequest:request delegate:self];
+                        NSError *jsonError;
+                        NSURLResponse *response = nil;
+                                    //[NSURLConnection connectionWithRequest:fileRequest delegate:self];
+                                    NSData *responseData = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:&jsonError];
+                                    NSString *responseString = [[NSString alloc] initWithData:responseData encoding:NSUTF8StringEncoding];
+                        
                     } else {
                         NSLog(@"The locationUpdateInd indication is set to false");
                     }
@@ -1566,10 +1573,13 @@
                 [self.locationManager setHeadingFilter:kCLHeadingFilterNone];
                 [self.locationManager requestAlwaysAuthorization];
                 [self.locationManager requestWhenInUseAuthorization];
-                // Allow background Update
-                if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 9) {
-                    _locationManager.allowsBackgroundLocationUpdates = YES;
-                }
+                CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
+                   if (status == kCLAuthorizationStatusAuthorizedAlways) {
+                       // Location permission is granted, enable background location updates
+                       if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 9) {
+                           _locationManager.allowsBackgroundLocationUpdates = YES;
+                       }
+                   }
                 [self.locationManager startUpdatingLocation];
                 [self KillTimers];
                 self.LocationTimer = [NSTimer scheduledTimerWithTimeInterval:locationInterval