cordova-plugin-mserviceinterface-2.0 1.0.27 → 1.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "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.27">
+    version="1.0.28">
     <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>
@@ -46,9 +46,10 @@
             <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
             <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
             <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+            <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
         </config-file>
         <config-file target="AndroidManifest.xml" parent="/manifest/application">
-			<service android:name="com.selfservit.util.mInterfaceService" android:enabled="true" android:exported="true"/>
+            <service android:name="com.selfservit.util.mInterfaceService" android:foregroundServiceType="location" android:enabled="true" android:exported="true"/>
 			<service
 				android:name="com.selfservit.util.backgroundNotification"
 				android:permission="android.permission.BIND_JOB_SERVICE"

package/src/android/mInterface.java

@@ -86,6 +86,8 @@ import java.io.OutputStreamWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Stack;
@@ -94,6 +96,9 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Arrays;
 
 import static android.app.Activity.RESULT_OK;
 
@@ -282,6 +287,12 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
         } else if (action.equals("GetPermissions")) {
             getPermissions(args, callbackContext);
             return true;
+        } else if (action.equals("GetLocationPermission")) {
+            getLocationPermission(args, callbackContext);
+            return true;
+        } else if (action.equals("CheckLocationPermission")) {
+            checkLocationPermission(args, callbackContext);
+            return true;
         } else if (action.equals("AppVersion")) {
             appVersion(callbackContext);
             return true;
@@ -943,13 +954,81 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
         callbackContext.success("file://" + mInterfaceUtil.rootDirectory + "/");
     }
 
+    private void checkLocationPermission(JSONArray args, CallbackContext callbackContext) {
+        boolean permissionGranted = true;
+        List<String> list;
+        try {
+            callback = callbackContext;
+            Context context = cordova.getActivity().getApplicationContext();
+            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {
+                String[] permissions = args.optJSONObject(0).optString("permissions").split(",");
+                list = new ArrayList<String>(Arrays.asList(permissions));
+                permissions = list.toArray(new String[0]);
+
+                for (int i = 0; i < permissions.length; i++) {
+                    if (ActivityCompat.checkSelfPermission(context, permissions[i]) != PackageManager.PERMISSION_GRANTED) {
+                        permissionGranted = false;
+                    }
+                };
+                if (!permissionGranted) {
+                    callback.error("failure");
+                } else {
+                    callback.success("success");
+                }
+            } else {
+                callback.success("success");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    private void getLocationPermission(JSONArray args, CallbackContext callbackContext) {
+        boolean permissionGranted = true;
+        List<String> list;
+        try {
+            callback = callbackContext;
+            Context context = cordova.getActivity().getApplicationContext();
+            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {
+                String[] permissions = args.optJSONObject(0).optString("permissions").split(",");
+                list = new ArrayList<String>(Arrays.asList(permissions));
+                permissions = list.toArray(new String[0]);
+
+                for (int i = 0; i < permissions.length; i++) {
+                    if (ActivityCompat.checkSelfPermission(context, permissions[i]) != PackageManager.PERMISSION_GRANTED) {
+                        permissionGranted = false;
+                    }
+                };
+                if (!permissionGranted) {
+                    PermissionHelper.requestPermissions(this, 111, permissions);
+                } else {
+                    callback.success("success");
+                }
+            } else {
+                callback.success("success");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
     private void getPermissions(JSONArray args, CallbackContext callbackContext) {
+        boolean permissionGranted = true;
+        List<String> list;
         try {
             callback = callbackContext;
             Context context = cordova.getActivity().getApplicationContext();
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                String[]permissions = args.optJSONObject(0).optString("permissions").split(",");
-                if ((ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE)) != PackageManager.PERMISSION_GRANTED || (ActivityCompat.checkSelfPermission(context, Manifest.permission.CAMERA)) != PackageManager.PERMISSION_GRANTED) {
+                String[] permissions = args.optJSONObject(0).optString("permissions").split(",");
+                if (Build.VERSION.SDK_INT != Build.VERSION_CODES.Q) {
+                    list = new ArrayList<String>(Arrays.asList(permissions));
+                    list.remove("android.permission.ACCESS_BACKGROUND_LOCATION");
+                    permissions = list.toArray(new String[0]);
+                };
+                for (int i = 0; i < permissions.length; i++) {
+                    if (ActivityCompat.checkSelfPermission(context, permissions[i]) != PackageManager.PERMISSION_GRANTED) {
+                        permissionGranted = false;
+                    }
+                };
+                if (!permissionGranted) {
                     PermissionHelper.requestPermissions(this, 1, permissions);
                 } else {
                     callback.success("success");
@@ -1757,8 +1836,12 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
     public void onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults) {
         try {
             boolean indicator = true;
+            String failedPermission = "failure";
             for (int i = 0; i < grantResults.length; i++) {
                 if (grantResults[i] != 0) {
+                    if (permissions[i].equalsIgnoreCase("android.permission.ACCESS_BACKGROUND_LOCATION")) {
+                        failedPermission = "background_location";
+                    }
                     indicator = false;
                     break;
                 }
@@ -1766,7 +1849,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             if (indicator) {
                 callback.success("success");
             } else {
-                callback.error("failure");
+                callback.error(failedPermission);
             }
         } catch (Exception e) {
             e.printStackTrace();

package/src/ios/mInterface.h

@@ -74,6 +74,7 @@
 - (void)OpenFileWithViewer:(CDVInvokedUrlCommand *)command;
 - (void)DeviceInfo:(CDVInvokedUrlCommand*)command;
 -(void)AppVersion:(CDVInvokedUrlCommand*)command;
+-(void)CheckLocationPermission:(CDVInvokedUrlCommand*)command;
 -(void)GetPermissions:(CDVInvokedUrlCommand*)command;
 -(void)RemoveFilesFromDirectory;
 -(void)DespatchQueueMoveToServer;

package/src/ios/mInterface.m

@@ -967,6 +967,11 @@
     [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
 }
 
+-(void)CheckLocationPermission:(CDVInvokedUrlCommand*)command {
+    CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
+}
+
 - (void)SendLocation {
     [self.commandDelegate runInBackground:^{
         @try {