cordova-plugin-mserviceinterface-2.0 1.0.67 → 1.0.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.67",
+  "version": "1.0.69",
   "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.67">
+    version="1.0.69">
     <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/mInterface.java

@@ -21,6 +21,7 @@ import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.location.Location;
@@ -82,6 +83,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -184,7 +186,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                         Toast.makeText(cordova.getActivity().getApplicationContext(), args.getJSONObject(0).optString("message"), Toast.LENGTH_SHORT).show();
                     }
                 } catch (Exception exception) {
-                    callbackContext.error("showToastWithOptions: "+ exception.getMessage());
+                    callbackContext.error("showToastWithOptions: " + exception.getMessage());
                 }
             } else if (action.equals("CheckLocationAccuracy")) {
                 int locationInt;
@@ -579,7 +581,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                 try {
                     new mInterfaceUtil().readFile(args, callbackContext);
                 } catch (Exception e) {
-                    callbackContext.error("ReadFile failed, exception is : "+e.getMessage());
+                    callbackContext.error("ReadFile failed, exception is : " + e.getMessage());
                 }
                 return true;
             } else if (action.equals("DeleteFile")) {
@@ -713,7 +715,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     cordova.getActivity().startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + cordova.getActivity().getApplicationContext().getPackageName())));
                     callbackContext.success("success");
                 } catch (Exception e) {
-                    callbackContext.error("UpdateNew failed, exception is : "+e.getMessage());
+                    callbackContext.error("UpdateNew failed, exception is : " + e.getMessage());
                 }
             } else if (action.equals("OpenFileWithViewer")) {
                 try {
@@ -733,7 +735,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     cordova.getActivity().startActivity(intent);
                     callbackContext.success();
                 } catch (Exception e) {
-                    callbackContext.error("OpenFileWithViewer failed, exception is : "+e.getMessage());
+                    callbackContext.error("OpenFileWithViewer failed, exception is : " + e.getMessage());
                 }
             } else if (action.equals("CaptureImageFromCamera")) {
                 try {
@@ -744,7 +746,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     captureImage(callbackContext);
                     return true;
                 } catch (Exception e) {
-                    callbackContext.error("CaptureImageFromCamera failed, exception is : "+e.getMessage());
+                    callbackContext.error("CaptureImageFromCamera failed, exception is : " + e.getMessage());
                 }
             } else if (action.equals("PickImageFromGallery")) {
                 try {
@@ -755,7 +757,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     pickImageFromGallery(callbackContext);
                     return true;
                 } catch (Exception e) {
-                    callbackContext.error("PickImageFromGallery failed, exception is : "+e.getMessage());
+                    callbackContext.error("PickImageFromGallery failed, exception is : " + e.getMessage());
                 }
             } else if (action.equals("CaptureFromCamera")) {
                 try {
@@ -784,7 +786,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     final DownloadTask downloadTask = new DownloadTask(cordova.getActivity(), callback);
                     downloadTask.execute(args.optJSONObject(0).optString("url"), args.optJSONObject(0).optString("filePath"), args.optJSONObject(0).optString("thumbnailInd"));
                 } catch (Exception e) {
-                    callbackContext.error("DownloadFile failed for "+args.optJSONObject(0).optString("url")+", exception is : "+e.getMessage());
+                    callbackContext.error("DownloadFile failed for " + args.optJSONObject(0).optString("url") + ", exception is : " + e.getMessage());
                 }
                 return true;
             } else if ("QueueProcessor".equals(action)) {
@@ -795,14 +797,14 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     scanQRCode(callbackContext);
                     return true;
                 } catch (Exception e) {
-                    callbackContext.error("ScanQRCode failed, exception is : "+e.getMessage());
+                    callbackContext.error("ScanQRCode failed, exception is : " + e.getMessage());
                 }
             } else if (action.equals("ScanBarCode")) {
                 try {
                     scanBarCode(callbackContext);
                     return true;
                 } catch (Exception e) {
-                    callbackContext.error("ScanBarCode failed, exception is : "+e.getMessage());
+                    callbackContext.error("ScanBarCode failed, exception is : " + e.getMessage());
                 }
             } else if (action.equals("GetSubDirectoryList")) {
                 new mInterfaceUtil().getSubDirectoryList(args, callbackContext);
@@ -821,7 +823,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                         callbackContext.success("");
                     }
                 } catch (Exception e) {
-                    callbackContext.error("GetAppStateInfo failed, exception is : "+e.getMessage());
+                    callbackContext.error("GetAppStateInfo failed, exception is : " + e.getMessage());
                 }
                 return true;
             } else if (action.equals("UpdateAppInfo")) {
@@ -833,7 +835,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                         callbackContext.error("failed to update app info");
                     }
                 } catch (Exception e) {
-                    callbackContext.error("UpdateAppInfo failed, exception is : "+e.getMessage());
+                    callbackContext.error("UpdateAppInfo failed, exception is : " + e.getMessage());
                 }
                 return true;
             } else if (action.equals("MoveFile")) {
@@ -876,7 +878,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     }
                 } catch (JSONException e) {
                     e.printStackTrace();
-                    result = new PluginResult(PluginResult.Status.ERROR, "OpenSms failed, exception is : "+e.getMessage());
+                    result = new PluginResult(PluginResult.Status.ERROR, "OpenSms failed, exception is : " + e.getMessage());
                     callback.sendPluginResult(result);
                 }
                 return true;
@@ -947,7 +949,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
-                    result = new PluginResult(PluginResult.Status.ERROR, "OpenEmail failed, exception is : "+e.getMessage());
+                    result = new PluginResult(PluginResult.Status.ERROR, "OpenEmail failed, exception is : " + e.getMessage());
                     callback.sendPluginResult(result);
                 }
 
@@ -961,17 +963,62 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     callbackContext.success("success");
                 } catch (Exception e) {
                     e.printStackTrace();
-                    result = new PluginResult(PluginResult.Status.ERROR, "copyAttachmentFile failed, exception is : "+e.getMessage());
+                    result = new PluginResult(PluginResult.Status.ERROR, "copyAttachmentFile failed, exception is : " + e.getMessage());
                     callback.sendPluginResult(result);
                 }
 
+            } else if (action.equals("getMyAccountsData")) {
+                try {
+                    String folderPath = mInterfaceUtil.rootDirectory + "/" + args.getJSONObject(0).optString("folderPath");
+                    ArrayList<JSONObject> dataArray = getJsonDataFromFiles(folderPath);
+                    JSONArray jsonResult = new JSONArray(dataArray);
+                    callbackContext.success(jsonResult.toString());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    PluginResult result = new PluginResult(PluginResult.Status.ERROR, "getMyAccountsData failed, exception is : " + e.getMessage());
+                    callback.sendPluginResult(result);
+                }
+            } else if (action.equals("KillBackgroundExecutions")) {
+                callbackContext.success("success");
+                return true;
             }
         } catch (JSONException e) {
-            System.out.println(" unable to proccess plugin method, exception is : "+e.getMessage());
+            System.out.println(" unable to proccess plugin method, exception is : " + e.getMessage());
         }
         return true;
     }
 
+    public static ArrayList<JSONObject> getJsonDataFromFiles(String folderPath) {
+        ArrayList<JSONObject> dataArray = new ArrayList<>();
+        try {
+            File folder = new File(folderPath);
+            if (folder.exists() && folder.isDirectory()) {
+                File[] files = folder.listFiles();
+
+                if (files != null) {
+                    for (File file : files) {
+                        if (file.isFile() && file.getName().endsWith(".json")) {
+                            StringBuilder jsonData = new StringBuilder();
+                            try (FileReader reader = new FileReader(file)) {
+                                int character;
+                                while ((character = reader.read()) != -1) {
+                                    jsonData.append((char) character);
+                                }
+                                JSONObject jsonObject = new JSONObject(mInterfaceUtil.decrypt(jsonData.toString()));
+                                dataArray.add(jsonObject);
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return dataArray;
+    }
+
     private boolean validateMobileNumber(String mobileNo) {
         String regex;
         boolean result = false;
@@ -1047,7 +1094,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             pluginResult.setKeepCallback(true);
             callbackContext.sendPluginResult(pluginResult);
         } catch (Exception e) {
-            callbackContext.error("scanQRCode failed, exception is : "+e.getMessage());
+            callbackContext.error("scanQRCode failed, exception is : " + e.getMessage());
         }
     }
 
@@ -1067,7 +1114,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             pluginResult.setKeepCallback(true);
             callbackContext.sendPluginResult(pluginResult);
         } catch (Exception e) {
-            callbackContext.error("scanBarCode failed, exception is : "+e.getMessage());
+            callbackContext.error("scanBarCode failed, exception is : " + e.getMessage());
         }
     }
 
@@ -1075,7 +1122,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
         try {
             callbackContext.success("file://" + mInterfaceUtil.rootDirectory + "/");
         } catch (Exception e) {
-            callbackContext.error("getStorageRoot failed, exception is : "+e.getMessage());
+            callbackContext.error("getStorageRoot failed, exception is : " + e.getMessage());
         }
     }
 
@@ -1171,7 +1218,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                 callback.success("success");
             }
         } catch (Exception e) {
-            callback.error("getPermissions failed, exception is : "+e.getMessage());
+            callback.error("getPermissions failed, exception is : " + e.getMessage());
         }
     }
 
@@ -1247,7 +1294,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             pluginResult.setKeepCallback(true);
             callbackContext.sendPluginResult(pluginResult);
         } catch (Exception e) {
-            callbackContext.error("pickImageFromGallery failed, exception is : "+e.getMessage());
+            callbackContext.error("pickImageFromGallery failed, exception is : " + e.getMessage());
         }
     }
 
@@ -1413,12 +1460,12 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                         callback.success(fileProperities);
                     } catch (Exception e) {
                         attachmentDestPath = "";
-                        callback.error("convertImageTo64BaseString failed, exception is : "+e.getMessage());
+                        callback.error("convertImageTo64BaseString failed, exception is : " + e.getMessage());
                     }
                 }
             } catch (Exception e) {
                 attachmentDestPath = "";
-                callbackContext.error("convertImageTo64BaseString failed, exception is : "+e.getMessage());
+                callbackContext.error("convertImageTo64BaseString failed, exception is : " + e.getMessage());
             }
 
         } catch (Exception e) {
@@ -1434,9 +1481,8 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             File image = new File(filePath);
             BitmapFactory.Options bmOptions = new BitmapFactory.Options();
             Bitmap bitmap = BitmapFactory.decodeFile(image.getAbsolutePath(), bmOptions);
-
             ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream);
+            bitmap.compress(Bitmap.CompressFormat.PNG, 100, outputStream);
             resultString = Base64.encodeToString(outputStream.toByteArray(), Base64.NO_WRAP);
         } catch (Exception e) {
             e.printStackTrace();
@@ -1453,7 +1499,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             pluginResult.setKeepCallback(true);
             callbackContext.sendPluginResult(pluginResult);
         } catch (Exception e) {
-            callbackContext.error("unable to choose file, exception is : "+e.getMessage());
+            callbackContext.error("unable to choose file, exception is : " + e.getMessage());
         }
     }
 
@@ -1486,7 +1532,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             r.put("build", packageManager.getPackageInfo(this.cordova.getActivity().getPackageName(), 0).versionCode);
             callbackContext.success(r);
         } catch (Exception e) {
-            callbackContext.error("unable to get appVersion, exception is : "+e.getMessage());
+            callbackContext.error("unable to get appVersion, exception is : " + e.getMessage());
         }
     }
 
@@ -1519,7 +1565,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             }
             callbackContext.success(currentOrientation);
         } catch (Exception e) {
-            callbackContext.success("rotateScreen failed, exception is : "+e.getMessage());
+            callbackContext.success("rotateScreen failed, exception is : " + e.getMessage());
         }
     }
 
@@ -1544,7 +1590,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             r.put("applicationName", getApplicationName(cordova.getActivity()));
             callbackContext.success(r);
         } catch (Exception e) {
-            callbackContext.error("unable to get deviceInfo, exception is : "+e.getMessage());
+            callbackContext.error("unable to get deviceInfo, exception is : " + e.getMessage());
         }
     }
 
@@ -1806,13 +1852,13 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                                 }
                             }
                         } catch (Exception e) {
-                            callback.error("onActivityResult failed, exception is : "+e.getMessage());
+                            callback.error("onActivityResult failed, exception is : " + e.getMessage());
                         }
                     } else {
                         callback.error("onActivityResult: Selected file path is null");
                     }
                 } catch (Exception e) {
-                    callback.error("onActivityResult failed, exception is : "+e.getMessage());
+                    callback.error("onActivityResult failed, exception is : " + e.getMessage());
                 }
             } else if (requestCode == REQUEST_IMAGE_CAPTURE && callback != null) {
                 if (resultCode == RESULT_OK) {
@@ -2054,7 +2100,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                 callback.error("Error occurred in opening outputStream");
             }
         } catch (Exception e) {
-            callback.error("copyFileFromUri failed, exception is : "+e.getMessage());
+            callback.error("copyFileFromUri failed, exception is : " + e.getMessage());
         }
         return outPutFilePath;
     }
@@ -2108,7 +2154,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     .checkLocationSettings(mGoogleApiClient1, builder.build());
             result.setResultCallback(this);
         } catch (Exception e) {
-            callbackContext.error("EnableGPSAutomatically failed, exception is : "+e.getMessage());
+            callbackContext.error("EnableGPSAutomatically failed, exception is : " + e.getMessage());
         }
     }
 
@@ -2119,7 +2165,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                 startLocationUpdates1();
             }
         } catch (Exception e) {
-            System.out.println("GoogleApiClient failed, exception is : "+e.getMessage());
+            System.out.println("GoogleApiClient failed, exception is : " + e.getMessage());
         }
     }
 
@@ -2151,7 +2197,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     break;
             }
         } catch (Exception e) {
-            System.out.println("LocationSettingsResult failed, exception is : "+e.getMessage());
+            System.out.println("LocationSettingsResult failed, exception is : " + e.getMessage());
         }
     }
 
@@ -2165,7 +2211,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                 callback.success(mCurrentLocation1.getLatitude() + "," + mCurrentLocation1.getLongitude());
             }
         } catch (Exception e) {
-            callback.error("onLocationChanged failed, exception is : "+e.getMessage());
+            callback.error("onLocationChanged failed, exception is : " + e.getMessage());
         }
     }
 
@@ -2221,7 +2267,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     output.write(data, 0, count);
                 }
             } catch (Exception e) {
-                downloadFileCallback.error("DownloadTask failed for url"+sUrl[0]+" , exception is : "+e.getMessage());
+                downloadFileCallback.error("DownloadTask failed for url" + sUrl[0] + " , exception is : " + e.getMessage());
             }
             if (sUrl[2].equalsIgnoreCase("true")) {
                 return sUrl[1];
@@ -2247,7 +2293,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     downloadFileCallback.success("");
                 }
             } catch (Exception e) {
-                downloadFileCallback.error("copyAttachmentFile failed, exception is : "+e.getMessage());
+                downloadFileCallback.error("copyAttachmentFile failed, exception is : " + e.getMessage());
             }
         }
     }
@@ -2344,7 +2390,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             else
                 callbackContext.error("Bad zip file");
         } catch (Exception e) {
-            String errorMessage = "unzipSync failed, exception is : "+e.getMessage();
+            String errorMessage = "unzipSync failed, exception is : " + e.getMessage();
             callbackContext.error(errorMessage);
         } finally {
             if (inputStream != null) {

package/src/android/mInterfaceService.java

@@ -1,6 +1,7 @@
 package com.selfservit.util;
 
 import static com.selfservit.util.mInterfaceUtil.decrypt;
+import static com.selfservit.util.mInterfaceUtil.rootDirectory;
 
 import android.Manifest;
 import android.annotation.TargetApi;
@@ -50,6 +51,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Timer;
@@ -115,7 +117,6 @@ public class mInterfaceService extends Service implements com.google.android.gms
                 }
             };
             setQueueToServerInterval.schedule(setQueueIntervalObj, 2000, 2000);
-
             // App State Info Process //
             mInterfaceUtil.validateAppStateInfo(getApplicationContext());
             if (!isGooglePlayServicesAvailable()) {
@@ -123,8 +124,8 @@ public class mInterfaceService extends Service implements com.google.android.gms
             }
             String currentLine;
             StringBuilder locConfigObj = new StringBuilder();
-            File baseDirectory = mInterfaceUtil.rootDirectory;
-            File locConfigFile = new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/location_configuration.txt");
+            File baseDirectory = rootDirectory;
+            File locConfigFile = new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/app_controller.json");
             if (locConfigFile.exists()) {
                 BufferedReader readerObj = new BufferedReader(new FileReader(locConfigFile));
                 while ((currentLine = readerObj.readLine()) != null) {
@@ -132,17 +133,9 @@ public class mInterfaceService extends Service implements com.google.android.gms
                 }
                 readerObj.close();
                 JSONObject serverDateObj = new JSONObject(decrypt(locConfigObj.toString()));
-
-                File locationCheckFile = new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/location_check.txt");
-                StringBuilder locConfigObj1 = new StringBuilder();
-                if (locationCheckFile.exists()) {
-                    BufferedReader readerObj1 = new BufferedReader(new FileReader(locationCheckFile));
-                    while ((currentLine = readerObj1.readLine()) != null) {
-                        locConfigObj1.append(currentLine);
-                    }
-                    readerObj1.close();
-                    String locationCheckStr = decrypt(locConfigObj1.toString());
-                    if (locationCheckStr.equals("false")) {
+                if (serverDateObj.has("location_check")) {
+                    boolean locationCheck = serverDateObj.getBoolean("location_check");
+                    if (!locationCheck) {
                         TimerTask timerTask = new TimerTask() {
                             @Override
                             public void run() {
@@ -156,8 +149,9 @@ public class mInterfaceService extends Service implements com.google.android.gms
                         };
                         if (setLocationTimeInterval == null) {
                             setLocationTimeInterval = new Timer();
-                            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"));
+                            JSONObject locationConfig = serverDateObj.getJSONObject("location_configuration");
+                            setLocationTimeInterval.schedule(timerTask, (Integer.parseInt(locationConfig.getString("location_fetch_interval_in_seconds")) * 1000L), (Integer.parseInt(locationConfig.getString("location_fetch_interval_in_seconds")) * 1000L));
+                            MINIMUM_INTERVAL = Long.parseLong(locationConfig.getString("location_fetch_interval_in_seconds"));
                             createLocationRequest();
                             this.mGoogleApiClient = new GoogleApiClient.Builder(this)
                                     .addConnectionCallbacks(this)
@@ -289,9 +283,9 @@ public class mInterfaceService extends Service implements com.google.android.gms
         String[] lastKnownLocation;
         boolean result = false;
         try {
-            baseDirectory = mInterfaceUtil.rootDirectory;
+            baseDirectory = rootDirectory;
             locationData = new StringBuilder();
-            File lastKnownLocationFile = new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/LastKnownLocation_encrypted.txt");
+            File lastKnownLocationFile = new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/last_known_location.txt");
             if (lastKnownLocationFile.exists()) {
                 readerObj = new BufferedReader(new FileReader(lastKnownLocationFile));
                 while ((currentLine = readerObj.readLine()) != null) {
@@ -336,30 +330,19 @@ public class mInterfaceService extends Service implements com.google.android.gms
             String statusIndication = "false";
             try {
                 String clientID, countryCode, userID, clientUrl;
-                BufferedReader myAccountsFileReader;
-                StringBuilder myAccountsFileBuilder;
-                JSONArray accountsList;
-                JSONObject currentAccount;
-                String currentLine;
-                if (new File(mInterfaceUtil.rootDirectory, "/" + mInterfaceUtil.packageName + "/" + "my_accounts_encrypted.txt").exists()) {
-                    myAccountsFileReader = new BufferedReader(new FileReader(new File(mInterfaceUtil.rootDirectory, "/" + mInterfaceUtil.packageName + "/" + "my_accounts_encrypted.txt")));
-                    myAccountsFileBuilder = new StringBuilder();
-                    while ((currentLine = myAccountsFileReader.readLine()) != null) {
-                        myAccountsFileBuilder.append(currentLine);
-                    }
-                    myAccountsFileReader.close();
-                    accountsList = new JSONArray(decrypt(myAccountsFileBuilder.toString()));
+                ArrayList<JSONObject> accountsList;
+                if (new File(rootDirectory, "/" + mInterfaceUtil.packageName + "/my_accounts").exists()) {
+                    accountsList = mInterface.getJsonDataFromFiles(new File(rootDirectory, "/" + mInterfaceUtil.packageName + "/my_accounts").getPath());
                     if (isConnected()) {
-                        for (int index = 0; index < accountsList.length(); index++) {
-                            currentAccount = accountsList.optJSONObject(index);
+                        for (JSONObject currentAccount : accountsList) {
                             clientID = currentAccount.optString("client_id");
                             countryCode = currentAccount.optString("country_code");
                             userID = currentAccount.optString("user_id");
                             clientUrl = currentAccount.optString("client_url");
-                            File baseDirectory = mInterfaceUtil.rootDirectory;
+                            File baseDirectory = rootDirectory;
                             File databaseDir = new File(baseDirectory + "/" + mInterfaceUtil.packageName + "/" + clientID + "/" + countryCode + "/database");
                             if (databaseDir.exists()) {
-                                String attachmentsPath = mInterfaceUtil.rootDirectory + "/" + mInterfaceUtil.packageName + "/" + clientID + "/" + countryCode + "/database/attachments";
+                                String attachmentsPath = rootDirectory + "/" + mInterfaceUtil.packageName + "/" + clientID + "/" + countryCode + "/database/attachments";
                                 String queuesPath = baseDirectory + "/" + mInterfaceUtil.packageName + "/" + clientID + "/" + countryCode + "/database/queue";
                                 if (new File(attachmentsPath).exists()) {
                                     File[] attachmentsFiles = new File(attachmentsPath).listFiles();
@@ -436,10 +419,7 @@ public class mInterfaceService extends Service implements com.google.android.gms
         @Override
         protected String doInBackground(String... urls) {
             String currentLine, clientID, countryCode, clientUrl, deviceID;
-            BufferedReader myAccountsFileReader;
-            StringBuilder myAccountsFileBuilder;
-            JSONArray accountsList;
-            JSONObject currentAccount;
+            ArrayList<JSONObject> accountsList;
             StringBuilder locationData;
             BufferedReader readerObj;
             BufferedWriter writerObj;
@@ -450,30 +430,23 @@ public class mInterfaceService extends Service implements com.google.android.gms
             URL requestPath;
 
             try {
-                File baseDirectory = mInterfaceUtil.rootDirectory;
-                if (new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/" + "my_accounts_encrypted.txt").exists()) {
-                    myAccountsFileReader = new BufferedReader(new FileReader(new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/" + "my_accounts_encrypted.txt")));
-                    myAccountsFileBuilder = new StringBuilder();
-                    while ((currentLine = myAccountsFileReader.readLine()) != null) {
-                        myAccountsFileBuilder.append(currentLine);
-                    }
-                    myAccountsFileReader.close();
-                    accountsList = new JSONArray(decrypt(myAccountsFileBuilder.toString()));
+                File baseDirectory = rootDirectory;
+                if (new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/my_accounts").exists()) {
+                    accountsList = mInterface.getJsonDataFromFiles(new File(rootDirectory, "/" + mInterfaceUtil.packageName + "/my_accounts").getPath());
                     locationData = new StringBuilder();
-                    readerObj = new BufferedReader(new FileReader(new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/MyLocation_encrypted.txt")));
+                    readerObj = new BufferedReader(new FileReader(new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/my_location.txt")));
                     while ((currentLine = readerObj.readLine()) != null) {
                         locationData.append(decrypt(currentLine));
                     }
                     readerObj.close();
                     serverData = locationData.toString();
 
-                    for (int index = 0; index < accountsList.length(); index++) {
-                        currentAccount = accountsList.optJSONObject(index);
+                    for (JSONObject currentAccount : accountsList) {
                         if (currentAccount.optString("location_update_ind").equals("true")) {
-                            clientID = mInterfaceUtil.clientID;
-                            countryCode = mInterfaceUtil.countryCode;
-                            clientUrl = mInterfaceUtil.clientUrl;
-                            deviceID = mInterfaceUtil.deviceID;
+                            clientID = currentAccount.optString("client_id");
+                            countryCode = currentAccount.optString("country_code");
+                            clientUrl = currentAccount.optString("client_url");
+                            deviceID = currentAccount.optString("device_id");
                             requestURL = clientUrl + "/common/components/GeoLocation/update_device_location_offline.aspx";
                             /* SEND LOCATION  */
                             requestPath = new URL(requestURL);
@@ -491,7 +464,7 @@ public class mInterfaceService extends Service implements com.google.android.gms
                             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 = new BufferedWriter(new FileWriter(new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/my_location.txt")));
                                     writerObj.write("");
                                     writerObj.flush();
                                     writerObj.close();
@@ -523,17 +496,17 @@ public class mInterfaceService extends Service implements com.google.android.gms
         @Override
         protected String doInBackground(String... urls) {
             File appDirectory,
-                    baseDirectory = mInterfaceUtil.rootDirectory;
+                    baseDirectory = rootDirectory;
             FileWriter fileWriterObj;
             appDirectory = new File(baseDirectory + "/" + mInterfaceUtil.packageName);
             if (appDirectory.exists()) {
                 try {
-                    fileWriterObj = new FileWriter(new File(baseDirectory, mInterfaceUtil.packageName + "/MyLocation_encrypted.txt"), true);
+                    fileWriterObj = new FileWriter(new File(baseDirectory, mInterfaceUtil.packageName + "/my_location.txt"), true);
                     fileWriterObj.write(mInterfaceUtil.encrypt(this.objLat + "," + this.objLon + "," + new SimpleDateFormat("yyyyMMddHHmmss", new mInterfaceUtil().locale).format(new Date()) + "\n"));
                     fileWriterObj.flush();
                     fileWriterObj.close();
 
-                    fileWriterObj = new FileWriter(new File(baseDirectory, mInterfaceUtil.packageName + "/LastKnownLocation_encrypted.txt"), false);
+                    fileWriterObj = new FileWriter(new File(baseDirectory, mInterfaceUtil.packageName + "/last_known_location.txt"), false);
                     fileWriterObj.write(mInterfaceUtil.encrypt(this.objLat + "," + this.objLon + "," + new SimpleDateFormat("yyyyMMddHHmmss", new mInterfaceUtil().locale).format(new Date())));
                     fileWriterObj.flush();
                     fileWriterObj.close();
@@ -577,7 +550,7 @@ public class mInterfaceService extends Service implements com.google.android.gms
             } else {
                 restartServicePI = PendingIntent.getService(
                         getApplicationContext(), 1, restartService,
-                        PendingIntent.FLAG_ONE_SHOT);
+                        PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
             }
 
             AlarmManager alarmService = (AlarmManager) getApplicationContext().getSystemService(Context.ALARM_SERVICE);
@@ -650,8 +623,8 @@ public class mInterfaceService extends Service implements com.google.android.gms
             };
             String currentLine;
             StringBuilder locConfigObj = new StringBuilder();
-            File baseDirectory = mInterfaceUtil.rootDirectory;
-            File locConfigFile = new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/location_configuration.txt");
+            File baseDirectory = rootDirectory;
+            File locConfigFile = new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/app_controller.json");
             if (locConfigFile.exists()) {
                 BufferedReader readerObj = new BufferedReader(new FileReader(locConfigFile));
                 while ((currentLine = readerObj.readLine()) != null) {
@@ -661,7 +634,9 @@ 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")) * 1000L), (Integer.parseInt(serverDateObj.optString("location_fetch_interval_in_seconds")) * 1000L));
+                JSONObject locationConfig = serverDateObj.getJSONObject("location_configuration");
+                setLocationTimeInterval.schedule(timerTask, (Integer.parseInt(locationConfig.getString("location_fetch_interval_in_seconds")) * 1000L), (Integer.parseInt(locationConfig.getString("location_fetch_interval_in_seconds")) * 1000L));
+                MINIMUM_INTERVAL = Long.parseLong(locationConfig.getString("location_fetch_interval_in_seconds"));
             }
         } catch (Exception e) {
             e.printStackTrace();