cordova-plugin-mserviceinterface-2.0 1.0.32 → 1.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "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.32">
+    version="1.0.33">
     <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>
@@ -24,6 +24,7 @@
 		<framework src="com.android.support:support-v4:26.0.1" />
 		<framework src="com.google.zxing:core:3.2.1" />
 	    <framework src="com.journeyapps:zxing-android-embedded:3.2.0@aar" />
+        <framework src="id.zelory:compressor:2.1.1" />
 		<edit-config xmlns:android="http://schemas.android.com/apk/res/android" file="AndroidManifest.xml" mode="merge" target="/manifest/application">
 			<application android:networkSecurityConfig="@xml/network_security_config" />
 			<application android:requestLegacyExternalStorage="true" />

package/src/android/mInterface.java

@@ -13,6 +13,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -30,6 +31,7 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.FileUtils;
 import android.os.PowerManager;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
@@ -77,6 +79,7 @@ import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -100,6 +103,9 @@ import java.util.List;
 import java.util.ArrayList;
 import java.util.Arrays;
 
+
+import id.zelory.compressor.Compressor;
+
 import static android.app.Activity.RESULT_OK;
 
 public class mInterface extends CordovaPlugin implements com.google.android.gms.location.LocationListener, GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, ResultCallback<LocationSettingsResult> {
@@ -667,7 +673,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             try {
                 Intent intent = new Intent(Intent.ACTION_VIEW);
                 Uri contentUri = FileProvider.getUriForFile(context, context.getPackageName() + ".provider", imageFilePath);
-                intent.setDataAndType(contentUri, getMimeType(filePath));
+                intent.setDataAndType(contentUri, getMimeType(filePath,null));
                 intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_ACTIVITY_NO_HISTORY);
                 cordova.getActivity().startActivity(intent);
                 callbackContext.success();
@@ -955,13 +961,18 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
     }
 
     private void checkLocationPermission(JSONArray args, CallbackContext callbackContext) {
-        boolean permissionGranted = true;
+        boolean permissionGranted = true, checkPermission = 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(",");
+            String[] permissions = args.optJSONObject(0).optString("permissions").split(",");
+            if (permissions[0].equalsIgnoreCase("android.permission.ACCESS_BACKGROUND_LOCATION")) {
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                    checkPermission = false;
+                }
+            };
+            if (checkPermission) {
                 list = new ArrayList<String>(Arrays.asList(permissions));
                 permissions = list.toArray(new String[0]);
 
@@ -988,7 +999,6 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
         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]);
@@ -1003,9 +1013,6 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                 } else {
                     callback.success("success");
                 }
-            } else {
-                callback.success("success");
-            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -1115,13 +1122,25 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
         callbackContext.sendPluginResult(pluginResult);
     }
 
-    private static String getMimeType(String path) {
+    private String getMimeType(String path,Uri uri) {
         String mimeType = null;
-        String extension = MimeTypeMap.getFileExtensionFromUrl(path);
-        if (extension != null) {
-            MimeTypeMap mime = MimeTypeMap.getSingleton();
-            mimeType = mime.getMimeTypeFromExtension(extension.toLowerCase());
-        }
+        if(uri==null){
+            String extension = MimeTypeMap.getFileExtensionFromUrl(path);
+            if (extension != null) {
+                MimeTypeMap mime = MimeTypeMap.getSingleton();
+                mimeType = mime.getMimeTypeFromExtension(extension.toLowerCase());
+            }
+        }else{
+            if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {
+                ContentResolver cr = cordova.getActivity().getContentResolver();
+                mimeType = cr.getType(uri);
+            } else {
+                String fileExtension = MimeTypeMap.getFileExtensionFromUrl(uri
+                        .toString());
+                mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
+                        fileExtension.toLowerCase());
+            }
+        };
         return mimeType;
     }
 
@@ -1156,6 +1175,121 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
     }
 
     public void convertImageTo64BaseString(CallbackContext callbackContext, String imageSourcePath, String imgSrcType, String destinationPath) {
+        InputStream srcFileReader;
+        OutputStream desFileWriter;
+        byte[] buf;
+        int srcFileSize;
+        String compressedImagePathStr = "";
+        String compressedImageName = "";
+        Bitmap bitmap;
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        String[] bits = imageSourcePath.split("/");
+
+        String fileNameToSend = bits[bits.length - 1];
+        if (fileNameToSend.indexOf(".") > 0)
+            fileNameToSend = fileNameToSend.substring(0, fileNameToSend.lastIndexOf("."));
+
+        File fileToCompress = new File(imageSourcePath);
+        String thumbnail = getFileThumbnail(imageSourcePath, "." + imageSourcePath.substring(imageSourcePath.lastIndexOf(".") + 1).toLowerCase());
+        File compressedImageFile = null;
+
+        try {
+              compressedImageFile = new Compressor(cordova.getActivity())
+                    .setQuality(15)
+                    .setCompressFormat(Bitmap.CompressFormat.JPEG)
+                    .compressToFile(fileToCompress);
+
+            if (imgSrcType.equals("compress")) {
+                String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
+                if (!destinationPath.equalsIgnoreCase("")) {
+                    compressedImagePathStr = mInterfaceUtil.rootDirectory + "/" + destinationPath;
+                } else {
+                    compressedImagePathStr = mInterfaceUtil.rootDirectory + "/" + mInterfaceUtil.packageName + "/" + "images";
+                }
+                compressedImageName = compressedImagePathStr + "/" + fileNameToSend + "_" + timeStamp + ".jpg";
+                File fileSavedPath = new File(compressedImagePathStr);
+                if (!fileSavedPath.exists()) {
+                    fileSavedPath.mkdirs();
+                }
+                File sourceFileObj = compressedImageFile;
+                //** CHECK SOURCE FILE EXITS OR NOT **//
+                if (sourceFileObj.exists()) {
+                    srcFileReader = new FileInputStream(sourceFileObj);
+                    desFileWriter = new FileOutputStream(new File(compressedImageName));
+                    buf = new byte[1024];
+                    //** WRITE SOURCE FILE INTO CONTENT_STORE DESTINATION PATH **//
+                    while ((srcFileSize = srcFileReader.read(buf)) > 0) {
+                        desFileWriter.write(buf, 0, srcFileSize);
+                    }
+                    srcFileReader.close();
+                    desFileWriter.close();
+                }
+                bitmap = BitmapFactory.decodeFile(compressedImageName);
+
+            } else {
+                bitmap = BitmapFactory.decodeFile(compressedImageFile.getAbsolutePath());
+            }
+            String encodedImage = null;
+            try {
+                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+                bitmap.compress(Bitmap.CompressFormat.JPEG, 10, outputStream);
+                Base64.encodeToString(outputStream.toByteArray(), Base64.NO_WRAP);
+                encodedImage = Base64.encodeToString(outputStream.toByteArray(), Base64.NO_WRAP);
+                if (imgSrcType.equals("camera")) {
+                    File file = new File(imageSourcePath);
+                    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("/"));
+                        String[] fileName1 = compressedImageName.split("/");
+                        fileName = fileName1[fileName1.length - 1];
+                        File file = new File(compressedImageName);
+                        long fileSize = file.length();
+                        fileExtension = "." + compressedImageName.substring(compressedImageName.lastIndexOf(".") + 1).toLowerCase();
+                        fileProperities = new JSONObject();
+                        fileProperities.put("filePath", imgFilePath);
+                        fileProperities.put("fileName", fileName);
+                        fileProperities.put("fileSize", fileSize);
+                        fileProperities.put("fileExtension", fileExtension);
+                        fileProperities.put("thumbnail", thumbnail);
+                        attachmentDestPath = "";
+                        callback.success(fileProperities);
+                    } catch (Exception e) {
+                        attachmentDestPath = "";
+                        callback.error(e.getMessage());
+                    }
+                }
+            } catch (Exception e) {
+                attachmentDestPath = "";
+                callbackContext.error(e.getMessage());
+            }
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
+
+ public void convertImageTo64BaseString1(CallbackContext callbackContext, String imageSourcePath, String imgSrcType, String destinationPath) {
         String compressedImagePathStr = "";
         String compressedImageName = "";
         String filePath = imageSourcePath;
@@ -1410,8 +1544,14 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
         r.put("timeZone", TimeZone.getDefault());
         r.put("sdkVersion", sdkversion);
         r.put("productName", android.os.Build.PRODUCT);
+        r.put("applicationName", getApplicationName(cordova.getActivity()));
         callbackContext.success(r);
     }
+    public static String getApplicationName(Context context) {
+        ApplicationInfo applicationInfo = context.getApplicationInfo();
+        int stringId = applicationInfo.labelRes;
+        return stringId == 0 ? applicationInfo.nonLocalizedLabel.toString() : context.getString(stringId);
+    }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -1602,6 +1742,8 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                                 fileName = fileName + "_" + timeStamp + extension;
                             }
 
+                        }else{
+                            fileName = uri.getLastPathSegment();
                         }
                     } finally {
                         if (cursor != null) {
@@ -1614,7 +1756,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
 
                 filePath = copyFileFromUri(cordova.getActivity().getApplicationContext(), uri, fileName, attachmentDestPath,callback);
                 File file = new File(filePath);
-                String mimeType = getMimeType(filePath);
+                String mimeType = getMimeType(filePath,uri);
                 System.out.println("Mime type is: " + mimeType);
                 double fileSize = file.length();
                 if (filePath != null) {

package/src/android/mInterfaceService.java

@@ -220,7 +220,8 @@ public class mInterfaceService extends Service implements com.google.android.gms
                                     .build();
                             mGoogleApiClient.connect();
                         };
-
+                        getPeriodicalLocationUpdates();
+                        update();
                     }
                 }
             } else {
@@ -542,19 +543,10 @@ public class mInterfaceService extends Service implements com.google.android.gms
                     readerObj = new BufferedReader(new FileReader(new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/MyLocation_encrypted.txt")));
                     while ((currentLine = readerObj.readLine()) != null) {
                         locationData.append(decrypt(currentLine));
-                        //lastKnownLocation = currentLine + "\n";
                     }
                     readerObj.close();
                     serverData = locationData.toString();
 
-                    /* CLEARING THE LOCATION POINTS */
-                    if (serverData != "") {
-                        writerObj = new BufferedWriter(new FileWriter(new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/MyLocation_encrypted.txt")));
-                        writerObj.write("");
-                        writerObj.flush();
-                        writerObj.close();
-                    }
-
                     for (int index = 0; index < accountsList.length(); index++) {
                         currentAccount = accountsList.optJSONObject(index);
                         if (currentAccount.optString("location_update_ind").toString().equals("true")) {
@@ -581,8 +573,18 @@ public class mInterfaceService extends Service implements com.google.android.gms
                             oStreamObj.write("<location_xml><client_id>" + clientID + "</client_id><country_code>" + countryCode + "</country_code><device_id>" + deviceID + "</device_id><location>" + serverData + "</location></location_xml>");
                             oStreamObj.flush();
                             oStreamObj.close();
-                            urlConObj.getResponseCode();
+                            int responseCode = urlConObj.getResponseCode();
+
                             urlConObj.disconnect();
+                            if(responseCode == HttpURLConnection.HTTP_OK){
+                                /* CLEARING THE LOCATION POINTS */
+                                if (serverData != "") {
+                                    writerObj = new BufferedWriter(new FileWriter(new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/MyLocation_encrypted.txt")));
+                                    writerObj.write("");
+                                    writerObj.flush();
+                                    writerObj.close();
+                                }
+                            }
                         } else {
                             System.out.println("Location should not be updated for this user..");
                         }