cordova-plugin-mserviceinterface-2.0 1.0.46 → 1.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.46",
+  "version": "1.0.48",
   "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.46">
+    version="1.0.48">
     <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

@@ -1,5 +1,7 @@
 package com.selfservit.util;
 
+import static com.selfservit.util.mInterfaceUtil.decrypt;
+
 import android.Manifest;
 import android.annotation.TargetApi;
 import android.app.AlarmManager;
@@ -20,11 +22,15 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Environment;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.SystemClock;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
+
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.google.android.gms.common.api.GoogleApiClient;
@@ -57,13 +63,6 @@ import java.util.TimerTask;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import static com.selfservit.util.mInterfaceUtil.decrypt;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.core.app.NotificationCompat;
-
 @TargetApi(Build.VERSION_CODES.O)
 public class mInterfaceService extends Service implements com.google.android.gms.location.LocationListener, GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener {
     public Timer setQueueInterval,
@@ -81,13 +80,15 @@ public class mInterfaceService extends Service implements com.google.android.gms
     public static boolean appStateTimerStatus = false;
     String notification_icon, notification_color, app_name;
     int imageResource, app_name_id, notification_color_id;
-	String locationUpdateInd = "false";
-    @ Override
+    String locationUpdateInd = "false";
+
+    @Override
     public IBinder onBind(Intent intent) {
         // TODO: Return the communication channel to the service.
         throw new UnsupportedOperationException("Not yet implemented");
     }
-    @ Override
+
+    @Override
     @TargetApi(Build.VERSION_CODES.O)
     public int onStartCommand(Intent intent, int flags, int startId) {
         try {
@@ -95,12 +96,12 @@ public class mInterfaceService extends Service implements com.google.android.gms
             if (mInterfaceUtil.packageName.equals("")) {
                 mInterfaceUtil.packageName = getApplicationContext().getPackageName().split("\\.")[2];
             }
-             notification_icon = "@drawable/ic_notification";
-             notification_color = "@color/notification_accent";
-             app_name = "@string/app_name";
-             imageResource = getResources().getIdentifier(notification_icon, null, getPackageName());
-             app_name_id = getResources().getIdentifier(app_name, null, getPackageName());
-             notification_color_id = getResources().getIdentifier(notification_color, null, getPackageName());
+            notification_icon = "@drawable/ic_notification";
+            notification_color = "@color/notification_accent";
+            app_name = "@string/app_name";
+            imageResource = getResources().getIdentifier(notification_icon, null, getPackageName());
+            app_name_id = getResources().getIdentifier(app_name, null, getPackageName());
+            notification_color_id = getResources().getIdentifier(notification_color, null, getPackageName());
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 String NOTIFICATION_CHANNEL_ID = "com.selfservit.msdoubleointeg";
                 String channelName = "DoubleO Background Service";
@@ -111,23 +112,23 @@ public class mInterfaceService extends Service implements com.google.android.gms
                 assert manager != null;
                 manager.createNotificationChannel(chan);
 
-                Uri uri= RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+                Uri uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
                 NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this);
                 Notification notification = notificationBuilder.setOngoing(true)
-                        .setContentTitle(getResources().getString(app_name_id)+" is running")
-						.setSmallIcon(imageResource)
+                        .setContentTitle(getResources().getString(app_name_id) + " is running")
+                        .setSmallIcon(imageResource)
                         .setColor(getResources().getColor(notification_color_id))
                         .setPriority(NotificationManager.IMPORTANCE_MIN)
                         .setCategory(Notification.CATEGORY_SERVICE)
                         .setChannelId(NOTIFICATION_CHANNEL_ID)
-                        .setVibrate(new long[] { 1000, 1000, 1000, 1000, 1000 })
+                        .setVibrate(new long[]{1000, 1000, 1000, 1000, 1000})
                         .setSound(uri)
                         .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
                         .build();
                 startForeground(2, notification);
             } else {
                 Notification notification = new NotificationCompat.Builder(this)
-                        .setContentTitle(getResources().getString(app_name_id)+" is running")
+                        .setContentTitle(getResources().getString(app_name_id) + " is running")
                         .setSmallIcon(imageResource)
                         .setColor(getResources().getColor(notification_color_id))
                         .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
@@ -140,8 +141,7 @@ 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 = 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,
@@ -210,9 +210,9 @@ public class mInterfaceService extends Service implements com.google.android.gms
                                 }
                             }
                         };
-                        if(setLocationTimeInterval == null){
+                        if (setLocationTimeInterval == null) {
                             setLocationTimeInterval = new Timer();
-                            setLocationTimeInterval.schedule(timerTask, Integer.parseInt(serverDateObj.optString("location_fetch_interval_in_seconds")), Integer.parseInt(serverDateObj.optString("location_fetch_interval_in_seconds")));
+                            setLocationTimeInterval.schedule(timerTask, (Integer.parseInt(serverDateObj.optString("location_fetch_interval_in_seconds")) * 1000L), (Integer.parseInt(serverDateObj.optString("location_fetch_interval_in_seconds")) * 1000L));
                             MINIMUM_INTERVAL = Long.parseLong(serverDateObj.optString("location_fetch_interval_in_seconds").toString());
                             createLocationRequest();
                             this.mGoogleApiClient = new GoogleApiClient.Builder(this)
@@ -314,7 +314,7 @@ public class mInterfaceService extends Service implements com.google.android.gms
                     new SendLocation().execute();
                 }
             }
-            String string = ("Lat itude : " + lat + "Longitude : " + lng + "\n");
+            String string = ("Latitude : " + lat + "Longitude : " + lng + "\n");
             System.out.println(string);
         }
     }
@@ -327,7 +327,7 @@ public class mInterfaceService extends Service implements com.google.android.gms
         String[] lastKnownLocation;
         boolean result = false;
         try {
-           baseDirectory = mInterfaceUtil.rootDirectory;
+            baseDirectory = mInterfaceUtil.rootDirectory;
             locationData = new StringBuilder();
             File lastKnownLocationFile = new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/LastKnownLocation_encrypted.txt");
             if (lastKnownLocationFile.exists()) {
@@ -524,8 +524,6 @@ public class mInterfaceService extends Service implements com.google.android.gms
             DocumentBuilder dbObj;
             Document docObj;
             OutputStreamWriter oStreamObj;
-
-
             JSONObject userObj;
             HttpURLConnection urlConObj;
             URL requestPath;
@@ -578,7 +576,7 @@ public class mInterfaceService extends Service implements com.google.android.gms
                             int responseCode = urlConObj.getResponseCode();
 
                             urlConObj.disconnect();
-                            if(responseCode == HttpURLConnection.HTTP_OK){
+                            if (responseCode == HttpURLConnection.HTTP_OK) {
                                 /* CLEARING THE LOCATION POINTS */
                                 if (serverData != "") {
                                     writerObj = new BufferedWriter(new FileWriter(new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/MyLocation_encrypted.txt")));
@@ -706,29 +704,11 @@ public class mInterfaceService extends Service implements com.google.android.gms
         }
     }
 
-    public class CoresTimerTask extends TimerTask {
-        private boolean hasStarted = false;
-
-        public void run() {
-            this.hasStarted = true;
-            setLocationTimeInterval = new Timer();
-            try {
-                getPeriodicalLocationUpdates();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        public boolean hasRunStarted() {
-            return this.hasStarted;
-        }
-    }
 
     public void update() throws IOException, JSONException {
         TimerTask timerTask = new TimerTask() {
             @Override
             public void run() {
-                System.out.println("Updated timer");
                 try {
                     getPeriodicalLocationUpdates();
                 } catch (Exception e) {
@@ -749,7 +729,7 @@ public class mInterfaceService extends Service implements com.google.android.gms
             JSONObject serverDateObj = new JSONObject(decrypt(locConfigObj.toString()));
             setLocationTimeInterval.cancel();
             setLocationTimeInterval = new Timer();
-            setLocationTimeInterval.schedule(timerTask, Integer.parseInt(serverDateObj.optString("location_fetch_interval_in_seconds")), Integer.parseInt(serverDateObj.optString("location_fetch_interval_in_seconds")));
+            setLocationTimeInterval.schedule(timerTask,  (Integer.parseInt(serverDateObj.optString("location_fetch_interval_in_seconds")) * 1000L),  (Integer.parseInt(serverDateObj.optString("location_fetch_interval_in_seconds")) * 1000L));
         }
     }
 

package/src/ios/mInterface.h

@@ -99,6 +99,7 @@
 - (void)GetNewDate:(CDVInvokedUrlCommand*)command;
 - (id)getCurrentDateTime;
 -(void)timeValues:(NSString *)date hour:(NSString *)hour minute:(NSString *)minute;
+-(void)SendChatAttachment:(CDVInvokedUrlCommand*)command;
 - (void)KillTimers;
 //- (void)AuthenticationRefresh;
 //- (void)triggerAuthenticationServices:(NSString *)clientId  countryCode:(NSString *)countryCode  userId:(NSString *)userId  sessionId:(NSString *)sessionId  localeId:(NSString *)localeId  deviceID:(NSString *)deviceID  clientUrl:(NSString *)clientUrl  cvsUrl:(NSString *)cvsUrl authIndFilePath:(NSString *)authIndFilePath;

package/src/ios/mInterface.m

@@ -1490,6 +1490,34 @@
     }
 }
 
+- (void)SendChatAttachment:(CDVInvokedUrlCommand*)command {
+    CDVPluginResult *result = nil;
+    @try {
+        NSString *statusIndication = @"false";
+        NSMutableDictionary *inputObject = [[command arguments] objectAtIndex:0];
+        NSString *filePath = inputObject[@"filePath"];
+        NSString *serverPath = inputObject[@"serverPath"];
+        NSString *fileName = inputObject[@"fileName"];
+        NSString *attachURL = [NSString stringWithFormat:@"%@/common/components/msvFileHandler/UploadFiles.aspx?&client_id=%@&country_code=%@&path=%@", clientUrl, clientID, countryCode, serverPath];
+        
+        statusIndication = [self sendFilesToServer:filePath fileName:fileName requestURL:attachURL];
+        if ([statusIndication isEqualToString:@"true"]) {
+            NSString *serviceResult = [NSString stringWithFormat:@"%s", "success"];
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:serviceResult];
+        } else {
+            NSString *serviceResult = [NSString stringWithFormat:@"%s", "failure"];
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:serviceResult];
+        }
+        
+        [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
+    } @catch (NSException *exception) {
+        NSString *fail_reason = [NSString stringWithFormat:@"%@\n%@\n%@",exception.name, exception.reason, exception.description ];
+        result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:fail_reason];
+        [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
+        NSLog(@"CheckLocation Exception is : %@", exception.description);
+    }
+}
+
 #pragma mark - MapViewDelegate
 - (void) locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray<CLLocation *> *)locations{