cordova-plugin-mserviceinterface-2.0 1.0.48 → 1.0.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.48",
+  "version": "1.0.50",
   "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.48">
+    version="1.0.50">
     <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/mInterfaceService.java

@@ -141,7 +141,20 @@ public class mInterfaceService extends Service implements com.google.android.gms
             TimerTask setQueueIntervalObj, setTimerIntervelObj;
             Intent serviceIntent = new Intent(getApplicationContext(), mInterfaceReceiver.class);
             serviceIntent.setAction("com.example.checkservice");
-            final PendingIntent pIntent = PendingIntent.getBroadcast(getApplicationContext(), 0,serviceIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+            final PendingIntent pIntent;
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+                pIntent = PendingIntent.getBroadcast(getApplicationContext(),
+                        0,
+                        serviceIntent,
+                        PendingIntent.FLAG_IMMUTABLE);
+            }
+            else
+            {
+                pIntent = PendingIntent.getBroadcast(getApplicationContext(),
+                        0,
+                        serviceIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT);
+            }
             long firstMillis = System.currentTimeMillis();
             AlarmManager alarm = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
             alarm.setRepeating(AlarmManager.RTC_WAKEUP, firstMillis,
@@ -159,19 +172,6 @@ public class mInterfaceService extends Service implements com.google.android.gms
 
             // App State Info Process //
             mInterfaceUtil.validateAppStateInfo(getApplicationContext());
-
-            // **** TimeReader Interval Timer ***** //
-            setTimerIntervel = new Timer();
-            setTimerIntervelObj = new TimerTask() {
-                public void run() {
-                    try {
-                        timeReader();
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            };
-            setTimerIntervel.schedule(setTimerIntervelObj, 60000, 60000);
             if (!isGooglePlayServicesAvailable()) {
                 //need to write location log file...
                 System.out.println("Play services not available..");
@@ -292,30 +292,38 @@ public class mInterfaceService extends Service implements com.google.android.gms
     }
 
     protected void startLocationUpdates() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
 
+                }
             }
+            PendingResult<Status> pendingResult = LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient, mLocationRequest, this, Looper.getMainLooper());
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        PendingResult<Status> pendingResult = LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient, mLocationRequest, this, Looper.getMainLooper());
     }
 
     @Override
     public void onLocationChanged(Location location) {
-        if (locationUpdateInd == "true") {
-            locationUpdateInd = "false";
-            mCurrentLocation = location;
-            mLastUpdateTime = DateFormat.getTimeInstance().format(new Date());
-            String lat = String.valueOf(mCurrentLocation.getLatitude());
-            String lng = String.valueOf(mCurrentLocation.getLongitude());
-            if (!isLocationDuplicate(lat, lng)) {
-                new UpdateLocation(lat, lng).execute("");
-                if (isConnected()) {
-                    new SendLocation().execute();
+        try {
+            if (locationUpdateInd == "true") {
+                locationUpdateInd = "false";
+                mCurrentLocation = location;
+                mLastUpdateTime = DateFormat.getTimeInstance().format(new Date());
+                String lat = String.valueOf(mCurrentLocation.getLatitude());
+                String lng = String.valueOf(mCurrentLocation.getLongitude());
+                if (!isLocationDuplicate(lat, lng)) {
+                    new UpdateLocation(lat, lng).execute("");
+                    if (isConnected()) {
+                        new SendLocation().execute();
+                    }
                 }
+                String string = ("Latitude : " + lat + "Longitude : " + lng + "\n");
+                System.out.println(string);
             }
-            String string = ("Latitude : " + lat + "Longitude : " + lng + "\n");
-            System.out.println(string);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
@@ -353,8 +361,12 @@ public class mInterfaceService extends Service implements com.google.android.gms
 
     @Override
     public void onConnected(@Nullable Bundle bundle) {
-        if (mGoogleApiClient.isConnected()) {
-            startLocationUpdates();
+        try {
+            if (mGoogleApiClient.isConnected()) {
+                startLocationUpdates();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
@@ -459,48 +471,15 @@ public class mInterfaceService extends Service implements com.google.android.gms
     }
 
     private void getPeriodicalLocationUpdates() throws Exception {
-        locationUpdateInd = "true";
-        mInterfaceUtil.timerInd = "running";
-        if (mGoogleApiClient.isConnected()) {
-            startLocationUpdates();
-        }
-    }
-
-    private void timeReader() throws Exception {
-        File baseDirectory = mInterfaceUtil.rootDirectory;
-        File exist_time_profile = new File(baseDirectory, mInterfaceUtil.packageName + "/time_profile.txt");
-        if (exist_time_profile.exists()) {
-            exist_time_profile.delete();
-        }
-        String serverTimeObj;
-        SimpleDateFormat simpleDateFormat;
-        StringBuilder timeObj;
-        String currentLine;
-        BufferedReader readerObj;
-        JSONObject serverDateObj;
-        timeObj = new StringBuilder();
-        BufferedWriter writerObj;
-        readerObj = new BufferedReader(new FileReader(new File(mInterfaceUtil.rootDirectory, "/" + mInterfaceUtil.packageName + "/" + "time_profile_encrypted.txt")));
-        while ((currentLine = readerObj.readLine()) != null) {
-            timeObj.append(currentLine);
+        try {
+            locationUpdateInd = "true";
+            mInterfaceUtil.timerInd = "running";
+            if (mGoogleApiClient.isConnected()) {
+                startLocationUpdates();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        readerObj.close();
-        serverDateObj = new JSONObject(decrypt(timeObj.toString()));
-        serverTimeObj = serverDateObj.optString("serverDate").toString();
-
-        // ******SERVER TIME ******//
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy,MM,dd,HH,mm,ss", new mInterfaceUtil().locale);
-        //String currentDateandTime = sdf.format(new Date());
-        simpleDateFormat = new SimpleDateFormat("yyyy,MM,dd,HH,mm,ss", new mInterfaceUtil().locale);
-        Date date = simpleDateFormat.parse(serverTimeObj);
-        long a = date.getTime() + 60000;
-        date.setTime(a);
-        serverTimeObj = simpleDateFormat.format(date);
-        serverDateObj.put("serverDate", serverTimeObj);
-        writerObj = new BufferedWriter(new FileWriter(new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/" + "time_profile_encrypted.txt")));
-        writerObj.write(mInterfaceUtil.encrypt(serverDateObj.toString()));
-        writerObj.flush();
-        writerObj.close();
     }
 
     @RequiresApi(api = Build.VERSION_CODES.O)
@@ -647,51 +626,71 @@ public class mInterfaceService extends Service implements com.google.android.gms
     public void onTaskRemoved(Intent rootIntent) {
         super.onTaskRemoved(rootIntent);
 
-        if (setQueueInterval != null) {
-            setQueueInterval.cancel();
-        }
-        if (setTimerIntervel != null) {
-            setTimerIntervel.cancel();
+        try {
+            if (setQueueInterval != null) {
+                setQueueInterval.cancel();
+            }
+            if (setTimerIntervel != null) {
+                setTimerIntervel.cancel();
+            }
+            Intent restartService = new Intent(getApplicationContext(),
+                    this.getClass());
+            restartService.setPackage(getPackageName());
+            PendingIntent restartServicePI;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                restartServicePI = PendingIntent.getService(
+                        getApplicationContext(), 1, restartService,
+                        PendingIntent.FLAG_IMMUTABLE);
+            }
+            else
+            {
+                restartServicePI = PendingIntent.getService(
+                        getApplicationContext(), 1, restartService,
+                        PendingIntent.FLAG_ONE_SHOT);
+            }
+
+            AlarmManager alarmService = (AlarmManager) getApplicationContext().getSystemService(Context.ALARM_SERVICE);
+            alarmService.set(AlarmManager.ELAPSED_REALTIME, SystemClock.elapsedRealtime() + 2000, restartServicePI);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        Intent restartService = new Intent(getApplicationContext(),
-                this.getClass());
-        restartService.setPackage(getPackageName());
-        PendingIntent restartServicePI = PendingIntent.getService(
-                getApplicationContext(), 1, restartService,
-                PendingIntent.FLAG_ONE_SHOT);
-        AlarmManager alarmService = (AlarmManager) getApplicationContext().getSystemService(Context.ALARM_SERVICE);
-        alarmService.set(AlarmManager.ELAPSED_REALTIME, SystemClock.elapsedRealtime() + 2000, restartServicePI);
     }
 
     /* WHEN THE RAM IS LOW */
     @Override
     public void onLowMemory() {
         super.onLowMemory();
+        try {
+            if (setQueueInterval != null) {
+                setQueueInterval.cancel();
+            }
 
-        if (setQueueInterval != null) {
-            setQueueInterval.cancel();
-        }
+            if (setTimerIntervel != null) {
+                setTimerIntervel.cancel();
+            }
 
-        if (setTimerIntervel != null) {
-            setTimerIntervel.cancel();
+            startService(new Intent(getApplicationContext(), mInterfaceService.class));
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-
-        startService(new Intent(getApplicationContext(), mInterfaceService.class));
     }
 
     /* USER CLICK FORCE STOP IN SETTINGS */
     @Override
     public void onDestroy() {
         super.onDestroy();
+        try {
+            if (setQueueInterval != null) {
+                setQueueInterval.cancel();
+            }
 
-        if (setQueueInterval != null) {
-            setQueueInterval.cancel();
-        }
-
-        if (setTimerIntervel != null) {
-            setTimerIntervel.cancel();
+            if (setTimerIntervel != null) {
+                setTimerIntervel.cancel();
+            }
+            startService(new Intent(getApplicationContext(), mInterfaceService.class));
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        startService(new Intent(getApplicationContext(), mInterfaceService.class));
     }
 
     public boolean isConnected() {

package/src/ios/mInterface.h

@@ -36,6 +36,8 @@
     NSString *clientUrl;
     NSString *deviceID;
     NSString *appInfoCaller;
+    NSString *imageAttachmentInd;
+    NSString *imageDestinationPath;
 @protected BOOL _isLocked;
     UIInterfaceOrientation _lastOrientation;
 }

package/src/ios/mInterface.m

@@ -1437,6 +1437,9 @@
 }
 
 - (void)CaptureImageFromCamera:(CDVInvokedUrlCommand*)command {
+    NSMutableDictionary *inputObject = [[command arguments] objectAtIndex:0];
+    imageAttachmentInd = inputObject[@"attachmentInd"];
+    imageDestinationPath = inputObject[@"destinationPath"];
     cameraOpen= [[UIImagePickerController alloc] init];
     if(![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]){
         return;
@@ -1455,6 +1458,9 @@
 }
 
 - (void)PickImageFromGallery:(CDVInvokedUrlCommand*)command {
+    NSMutableDictionary *inputObject = [[command arguments] objectAtIndex:0];
+    imageAttachmentInd = inputObject[@"attachmentInd"];
+    imageDestinationPath = inputObject[@"destinationPath"];
     imagePicker= [[UIImagePickerController alloc] init];
     /*if(![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]){
         return;
@@ -1991,7 +1997,7 @@
             }
             NSDate *now = [NSDate date];
             NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-            dateFormatter.dateFormat = @"yyyyMMdd_HHmm-ss";
+            dateFormatter.dateFormat = @"yyyyMMddHHmmss";
             [dateFormatter setTimeZone:[NSTimeZone systemTimeZone]];
             NSString *gmtTime = [dateFormatter stringFromDate:now];
             NSString *destination = [NSString stringWithFormat:@"%@/%@.jpg", dest, gmtTime];
@@ -2014,26 +2020,113 @@
         NSLog(@"refURL : %@", refURL);
         ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
         [assetslibrary assetForURL:refURL resultBlock:resultblock failureBlock:nil];
-    } else if ([picker isEqual: cameraOpen] || [picker isEqual:imagePicker]) {
-        //if(UI_USER_INTERFACE_IDIOM()==UIUserInterfaceIdiomPhone) {
+    } else if ([picker isEqual: cameraOpen]) {
+        if ([imageAttachmentInd isEqualToString:@"true"]) {
+            //if(UI_USER_INTERFACE_IDIOM()==UIUserInterfaceIdiomPhone) {
+                [picker dismissViewControllerAnimated:YES completion:nil];
+           // } else {
+           //     [popover dismissPopoverAnimated:YES];
+           // }
+            UIImageView *ivPickedImage = [[UIImageView alloc] init];
+            ivPickedImage.image = [info objectForKey:UIImagePickerControllerOriginalImage];
+            NSURL *refURL = (NSURL *)[info valueForKey:UIImagePickerControllerReferenceURL];
+            // define the block to call when we get the asset based on the url (below)
+            ALAssetsLibraryAssetForURLResultBlock resultblock = ^(ALAsset *imageAsset) {
+                UIImage *image = ivPickedImage.image;
+                NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+                NSString *directory = [paths objectAtIndex:0];
+                NSString* appRootPath = [directory stringByAppendingPathComponent:[self GetAppName]];
+                NSString *imagesFolderPath = [appRootPath stringByAppendingPathComponent:imageDestinationPath];
+                if (![[NSFileManager defaultManager] fileExistsAtPath:imagesFolderPath]){
+                    [[NSFileManager defaultManager] createDirectoryAtPath:imagesFolderPath withIntermediateDirectories:YES attributes:nil error:nil];
+                }
+                NSDateFormatter *dateFormatter = [self getCurrentDateTime];
+                [dateFormatter setDateFormat:@"yyyyMMddHHmmss"];
+                NSString *fileName = [NSString stringWithFormat:@"%@.png", [dateFormatter stringFromDate:[NSDate date]]];
+                NSString* imageSavedPath = [imagesFolderPath stringByAppendingPathComponent:fileName];
+                NSData* imageData = UIImageJPEGRepresentation(image, 0.3);
+                [imageData writeToFile:imageSavedPath atomically:YES];
+                long imgSize = imageData.length;
+                NSString *strImageSize = [NSString stringWithFormat:@"%ld", imgSize];
+                NSString *extension = [[NSString stringWithFormat:@".%@",[imageSavedPath pathExtension]] lowercaseString];
+                NSMutableDictionary * dict = [[NSMutableDictionary alloc] init];
+                [dict setValue:[imageSavedPath stringByDeletingLastPathComponent] forKey:@"filePath"];
+                [dict setValue:[imageSavedPath lastPathComponent] forKey:@"fileName"];
+                [dict setValue:strImageSize forKey:@"fileSize"];
+                [dict setValue:extension forKey:@"fileExtension"];
+                CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dict];
+                [self.commandDelegate sendPluginResult:result callbackId:self.callbackIdForImagePicker];
+            };
+            ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
+            [assetslibrary assetForURL:refURL resultBlock:resultblock failureBlock:nil];
+        } else {
             [picker dismissViewControllerAnimated:YES completion:nil];
-        // } else {
-         //   [popover dismissPopoverAnimated:YES];
-       // }
-        UIImageView *ivPickedImage = [[UIImageView alloc] init];
-        ivPickedImage.image = [info objectForKey:UIImagePickerControllerOriginalImage];
-        UIImage *finalImage = [self imageWithImage:ivPickedImage.image scaledToWidth:824.00];
-        NSURL *refURL = (NSURL *)[info valueForKey:UIImagePickerControllerReferenceURL];
-        // define the block to call when we get the asset based on the url (below)
-        ALAssetsLibraryAssetForURLResultBlock resultblock = ^(ALAsset *imageAsset)
-        {
-            NSData *imageData = UIImageJPEGRepresentation(finalImage, 0.1);
-            NSString * base64String = [imageData base64EncodedStringWithOptions:0];
-            CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:base64String];
-            [self.commandDelegate sendPluginResult:result callbackId:self.callbackIdForImagePicker];
-        };
-        ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
-        [assetslibrary assetForURL:refURL resultBlock:resultblock failureBlock:nil];
+            UIImageView *ivPickedImage = [[UIImageView alloc] init];
+            ivPickedImage.image = [info objectForKey:UIImagePickerControllerOriginalImage];
+            UIImage *finalImage = [self imageWithImage:ivPickedImage.image scaledToWidth:824.00];
+            NSURL *refURL = (NSURL *)[info valueForKey:UIImagePickerControllerReferenceURL];
+            ALAssetsLibraryAssetForURLResultBlock resultblock = ^(ALAsset *imageAsset)
+            {
+                NSData *imageData = UIImageJPEGRepresentation(finalImage, 0.1);
+                NSString * base64String = [imageData base64EncodedStringWithOptions:0];
+                CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:base64String];
+                [self.commandDelegate sendPluginResult:result callbackId:self.callbackIdForImagePicker];
+            };
+            ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
+            [assetslibrary assetForURL:refURL resultBlock:resultblock failureBlock:nil];
+        }
+    } else if ([picker isEqual:imagePicker]) {
+        if ([imageAttachmentInd isEqualToString:@"true"]) {
+            UIImageView *ivPickedImage = [[UIImageView alloc] init];
+            ivPickedImage.image = [info objectForKey:UIImagePickerControllerOriginalImage];
+            NSURL *refURL = (NSURL *)[info valueForKey:UIImagePickerControllerReferenceURL];
+            // define the block to call when we get the asset based on the url (below)
+            ALAssetsLibraryAssetForURLResultBlock resultblock = ^(ALAsset *imageAsset) {
+                UIImage *image = ivPickedImage.image;
+                NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+                NSString *directory = [paths objectAtIndex:0];
+                NSString* appRootPath = [directory stringByAppendingPathComponent:[self GetAppName]];
+                NSString *imagesFolderPath = [appRootPath stringByAppendingPathComponent:imageDestinationPath];
+                if (![[NSFileManager defaultManager] fileExistsAtPath:imagesFolderPath]){
+                    [[NSFileManager defaultManager] createDirectoryAtPath:imagesFolderPath withIntermediateDirectories:YES attributes:nil error:nil];
+                }
+                NSDateFormatter *dateFormatter = [self getCurrentDateTime];
+                [dateFormatter setDateFormat:@"yyyyMMddHHmmss"];
+                NSString *fileName = [NSString stringWithFormat:@"%@.png", [dateFormatter stringFromDate:[NSDate date]]];
+                NSString* imageSavedPath = [imagesFolderPath stringByAppendingPathComponent:fileName];
+                NSData* imageData = UIImageJPEGRepresentation(image, 0.3);
+                [imageData writeToFile:imageSavedPath atomically:YES];
+                long imgSize = imageData.length;
+                NSString *strImageSize = [NSString stringWithFormat:@"%ld", imgSize];
+                NSString *extension = [[NSString stringWithFormat:@".%@",[imageSavedPath pathExtension]] lowercaseString];
+                NSMutableDictionary * dict = [[NSMutableDictionary alloc] init];
+                [dict setValue:[imageSavedPath stringByDeletingLastPathComponent] forKey:@"filePath"];
+                [dict setValue:[imageSavedPath lastPathComponent] forKey:@"fileName"];
+                [dict setValue:strImageSize forKey:@"fileSize"];
+                [dict setValue:extension forKey:@"fileExtension"];
+                CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dict];
+                [self.commandDelegate sendPluginResult:result callbackId:self.callbackIdForImagePicker];
+             };
+             // get the asset library and fetch the asset based on the ref url (pass in block above)
+             NSLog(@"refURL : %@", refURL);
+             ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
+             [assetslibrary assetForURL:refURL resultBlock:resultblock failureBlock:nil];
+        } else {
+            [picker dismissViewControllerAnimated:YES completion:nil];
+            UIImageView *ivPickedImage = [[UIImageView alloc] init];
+            ivPickedImage.image = [info objectForKey:UIImagePickerControllerOriginalImage];
+            UIImage *finalImage = [self imageWithImage:ivPickedImage.image scaledToWidth:824.00];
+            NSURL *refURL = (NSURL *)[info valueForKey:UIImagePickerControllerReferenceURL];
+            ALAssetsLibraryAssetForURLResultBlock resultblock = ^(ALAsset *imageAsset)
+            {
+                NSData *imageData = UIImageJPEGRepresentation(finalImage, 0.1);
+                NSString * base64String = [imageData base64EncodedStringWithOptions:0];
+                CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:base64String];
+                [self.commandDelegate sendPluginResult:result callbackId:self.callbackIdForImagePicker];
+            };
+            ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
+            [assetslibrary assetForURL:refURL resultBlock:resultblock failureBlock:nil];
+        }
     } else if ([picker isEqual:liveCamera]) {
         //if(UI_USER_INTERFACE_IDIOM()==UIUserInterfaceIdiomPhone) {
             [picker dismissViewControllerAnimated:YES completion:nil];