cordova-plugin-mserviceinterface-2.0 1.0.24 → 1.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.24",
+  "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.24">
+    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;
 
@@ -104,6 +109,8 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
     public CallbackContext callback;
     private static JSONArray arguments = null;
     private String pictureFilePath;
+    private String cameraAttachmentInd = "false";
+    private String galleryAttachmentInd = "false";
     private static final int REQUEST_IMAGE_CAPTURE = 111;
     private static final int PICK_IMAGE_FROM_GALLERY = 112;
     private static final int REQUEST_LIVE_IMAGE_CAPTURE = 113;
@@ -280,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;
@@ -663,6 +676,10 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             }
         } else if (action.equals("CaptureImageFromCamera")) {
             try {
+                if(args.length()>0){
+                    attachmentDestPath = args.optJSONObject(0).optString("destinationPath");
+                    cameraAttachmentInd = args.getJSONObject(0).optString("attachmentInd");
+                }
                 captureImage(callbackContext);
                 return true;
             } catch (Exception e) {
@@ -670,6 +687,10 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             }
         } else if (action.equals("PickImageFromGallery")) {
             try {
+                if(args.length()>0) {
+                    attachmentDestPath = args.optJSONObject(0).optString("destinationPath");
+                    galleryAttachmentInd = args.getJSONObject(0).optString("attachmentInd");
+                }
                 pickImageFromGallery(callbackContext);
                 return true;
             } catch (Exception e) {
@@ -933,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");
@@ -1180,11 +1269,19 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     if (file.exists()) {
                         file.delete();
                     }
+                    attachmentDestPath = "";
                     callbackContext.success(encodedImage);
                 } else if (imgSrcType.equals("gallery")) {
+                    attachmentDestPath = "";
                     callbackContext.success(encodedImage);
                 } else if (imgSrcType.equals("compress")) {
                     try {
+                        if(!destinationPath.equalsIgnoreCase("")){
+                            File file = new File(imageSourcePath);
+                            if (file.exists()) {
+                                file.delete();
+                            }
+                        }
                         JSONObject fileProperities = null;
                         String imgFilePath, fileName, fileExtension = "";
                         imgFilePath = compressedImageName.substring(0, compressedImageName.lastIndexOf("/"));
@@ -1199,12 +1296,15 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                         fileProperities.put("fileSize", fileSize);
                         fileProperities.put("fileExtension", fileExtension);
                         fileProperities.put("thumbnail", getFileThumbnail(imgFilePath+ "/" +fileName, fileExtension));
+                        attachmentDestPath = "";
                         callback.success(fileProperities);
                     } catch (Exception e) {
+                        attachmentDestPath = "";
                         callback.error(e.getMessage());
                     }
                 }
             } catch (Exception e) {
+                attachmentDestPath = "";
                 callbackContext.error(e.getMessage());
             }
         } catch (Exception e) {
@@ -1446,9 +1546,18 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     if (filePath != null) {
                         try {
                             if (fileExtension.equals(".heic")) {
-                                convertImageTo64BaseString(callback, filePath + "/" + fileName, "gallery","");
+                                if(galleryAttachmentInd.equals("true")){
+                                    convertImageTo64BaseString(callback, filePath + "/" + fileName, "compress",attachmentDestPath);
+                                }else{
+                                    convertImageTo64BaseString(callback, filePath + "/" + fileName, "gallery","");
+                                }
+
                             } else if (fileExtension.equals(".jpeg") || fileExtension.equals(".jpg") || fileExtension.equals(".png")) {
-                                convertImageTo64BaseString(callback, filePath + "/" + fileName, "gallery","");
+                                if(galleryAttachmentInd.equals("true")){
+                                    convertImageTo64BaseString(callback, filePath + "/" + fileName, "compress",attachmentDestPath);
+                                }else{
+                                    convertImageTo64BaseString(callback, filePath + "/" + fileName, "gallery","");
+                                }
                             } else {
                                 callback.error("Only JPEG or PNG file extensions are allowed to attach.");
                             }
@@ -1523,6 +1632,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                                     fileProperities.put("fileSize", fileSize);
                                     fileProperities.put("fileExtension", extension);
                                     fileProperities.put("thumbnail", getFileThumbnail(filePath, extension));
+                                    attachmentDestPath = "";
                                     callback.success(fileProperities);
                                 }
                             } else {
@@ -1546,7 +1656,12 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             }
         } else if (requestCode == REQUEST_IMAGE_CAPTURE && callback != null) {
             if (resultCode == RESULT_OK) {
-                convertImageTo64BaseString(callback, pictureFilePath, "camera","");
+                if(cameraAttachmentInd.equals("true")){
+                    convertImageTo64BaseString(callback, pictureFilePath, "compress", attachmentDestPath);
+                }else{
+                    convertImageTo64BaseString(callback, pictureFilePath, "camera","");
+                }
+
             } else if (resultCode == Activity.RESULT_CANCELED) {
                 // TODO NO_RESULT or error callback?
                 File file = new File(pictureFilePath);
@@ -1721,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;
                 }
@@ -1730,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

@@ -40,6 +40,7 @@
     UIInterfaceOrientation _lastOrientation;
 }
 @property(strong) NSString* callbackID;
+- (void)GetFCMUtils:(CDVInvokedUrlCommand *)command;
 -(void)GetBase64String:(CDVInvokedUrlCommand *)command;
 - (void)ValidateAppStateInfo;
 -(void)HandleAppStateTimer:(NSString *)status;
@@ -73,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

@@ -10,6 +10,9 @@
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include "TargetConditionals.h"
+#import "OneSignalPush.h"
+#import <OneSignal/OneSignal.h>
+#import <objc/runtime.h>
 
 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
 @import UserNotifications;
@@ -26,6 +29,15 @@
 @synthesize controller = docController;
 @synthesize callbackID;
 
+- (void)GetFCMUtils:(CDVInvokedUrlCommand *)command {
+    OSDeviceState *deviceState = [OneSignal getDeviceState];
+    NSMutableDictionary * deviceDict = [[NSMutableDictionary alloc] init];
+    [deviceDict setValue:deviceState.userId forKey:@"userId"];
+    [deviceDict setValue:deviceState.pushToken forKey:@"pushToken"];
+    CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:deviceDict];
+    [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
+}
+
 -(void)GetBase64String:(CDVInvokedUrlCommand *)command {
     NSMutableDictionary *dict = [[command arguments] objectAtIndex:0];
     NSString *directory = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)[0];
@@ -955,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 {