cordova-plugin-mserviceinterface-2.0 1.0.49 → 1.0.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.49",
+  "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.49">
+    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() {