cordova-plugin-mserviceinterface-2.0 1.0.62 → 1.0.64

package/src/android/mInterfaceReceiver.java

@@ -11,13 +11,13 @@ public class mInterfaceReceiver extends BroadcastReceiver {
         //constructor
     }
 
-    @ Override
+    @Override
     public void onReceive(Context context, Intent intent) {
         try {
             if (intent.getAction().equalsIgnoreCase(Intent.ACTION_BOOT_COMPLETED)) {
                 Intent serviceIntent = new Intent(context, mInterfaceService.class);
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    context.startForegroundService(serviceIntent);
+                    context.startService(serviceIntent);
                 } else {
                     context.startService(serviceIntent);
                 }
@@ -26,33 +26,42 @@ public class mInterfaceReceiver extends BroadcastReceiver {
                 if (!isServiceRunning(context) || !isProcessRunning(context)) {
                     Intent serviceIntent = new Intent(context, mInterfaceService.class);
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        context.startForegroundService(serviceIntent);
+                        context.startService(serviceIntent);
                     } else {
                         context.startService(serviceIntent);
                     }
                 }
             }
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
+
     private boolean isServiceRunning(Context context) {
-        ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
-            if (mInterfaceService.class.getName().equals(service.service.getClassName())) {
-                return true;
+        try {
+            ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+            for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+                if (mInterfaceService.class.getName().equals(service.service.getClassName())) {
+                    return true;
+                }
             }
+        } catch (SecurityException e) {
+            e.printStackTrace();
         }
-
         return false;
     }
+
     private boolean isProcessRunning(Context context) {
-        ActivityManager manager1 = (ActivityManager)context.getApplicationContext().getSystemService(Context.ACTIVITY_SERVICE);
-        for (ActivityManager.RunningAppProcessInfo processInfo : manager1.getRunningAppProcesses()) {
-            if (processInfo.processName.equals(context.getPackageName())) {
-                return true;
+        try {
+            ActivityManager manager1 = (ActivityManager) context.getApplicationContext().getSystemService(Context.ACTIVITY_SERVICE);
+            for (ActivityManager.RunningAppProcessInfo processInfo : manager1.getRunningAppProcesses()) {
+                if (processInfo.processName.equals(context.getPackageName())) {
+                    return true;
+                }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return false;
     }

package/src/android/mInterfaceService.java

@@ -187,12 +187,6 @@ public class mInterfaceService extends Service implements com.google.android.gms
         return START_STICKY;
     }
 
-
-    private void showToast() {
-        Handler handler = new Handler(Looper.getMainLooper());
-        handler.post(() -> Toast.makeText(mInterfaceService.this, "Background service is running!", Toast.LENGTH_SHORT).show());
-    }
-
     public static void handleAppStateTimer(String status) {
         try {
             if (status.equalsIgnoreCase("failure")) {
@@ -224,8 +218,13 @@ public class mInterfaceService extends Service implements com.google.android.gms
     }
 
     private boolean isGooglePlayServicesAvailable() {
-        int resultCode = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(this);
-        return ConnectionResult.SUCCESS == resultCode;
+        try {
+            int resultCode = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(this);
+            return ConnectionResult.SUCCESS == resultCode;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
     }
 
     public void createLocationRequest() {
@@ -245,13 +244,13 @@ public class mInterfaceService extends Service implements com.google.android.gms
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 if (context.checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
                     isPermissionGranted = false;
-                }else{
+                } else {
                     isPermissionGranted = true;
                 }
-            }else{
+            } else {
                 isPermissionGranted = true;
             }
-            if(isPermissionGranted){
+            if (isPermissionGranted) {
                 PendingResult<Status> pendingResult = LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient, mLocationRequest, this, Looper.getMainLooper());
             }
         } catch (Exception e) {
@@ -626,37 +625,46 @@ public class mInterfaceService extends Service implements com.google.android.gms
 
 
     public boolean isConnected() {
-        ConnectivityManager online = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
-        NetworkInfo networkInfo = online.getActiveNetworkInfo();
-        return networkInfo != null && networkInfo.isConnected();
+        try {
+            ConnectivityManager online = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
+            NetworkInfo networkInfo = online.getActiveNetworkInfo();
+            return networkInfo != null && networkInfo.isConnected();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
     }
 
 
-    public void update() throws IOException, JSONException {
-        TimerTask timerTask = new TimerTask() {
-            @Override
-            public void run() {
-                try {
-                    getPeriodicalLocationUpdates();
-                } catch (Exception e) {
-                    e.printStackTrace();
+    public void update() {
+        try {
+            TimerTask timerTask = new TimerTask() {
+                @Override
+                public void run() {
+                    try {
+                        getPeriodicalLocationUpdates();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
+            };
+            String currentLine;
+            StringBuilder locConfigObj = new StringBuilder();
+            File baseDirectory = mInterfaceUtil.rootDirectory;
+            File locConfigFile = new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/location_configuration.txt");
+            if (locConfigFile.exists()) {
+                BufferedReader readerObj = new BufferedReader(new FileReader(locConfigFile));
+                while ((currentLine = readerObj.readLine()) != null) {
+                    locConfigObj.append(currentLine);
+                }
+                readerObj.close();
+                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));
             }
-        };
-        String currentLine;
-        StringBuilder locConfigObj = new StringBuilder();
-        File baseDirectory = mInterfaceUtil.rootDirectory;
-        File locConfigFile = new File(baseDirectory, "/" + mInterfaceUtil.packageName + "/location_configuration.txt");
-        if (locConfigFile.exists()) {
-            BufferedReader readerObj = new BufferedReader(new FileReader(locConfigFile));
-            while ((currentLine = readerObj.readLine()) != null) {
-                locConfigObj.append(currentLine);
-            }
-            readerObj.close();
-            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));
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 

package/src/android/mInterfaceUtil.java

@@ -5,6 +5,7 @@ import static com.selfservit.util.mInterface.pathComponent;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -85,6 +86,8 @@ public class mInterfaceUtil {
     public static String deviceID = "";
     public static String timerInd = "";
 
+    private static final String PREFS_NAME = "app_prefs";
+    private static final String KEY_FIRST_LAUNCH = "first_launch";
     public static String decrypt(String encryptedText) {
         String decryptedText = "";
         try {
@@ -157,7 +160,7 @@ public class mInterfaceUtil {
                             output.write(data, 0, count);
                         }
                     } catch (Exception e) {
-                        callbackContext.error("Failure" + e.getMessage());
+                        callbackContext.error("DownloadChatAttachment failed, Exception is : " + e.getMessage());
                     }
                     if (thumbnailInd.equalsIgnoreCase("true")) {
                         return filePath;
@@ -182,7 +185,7 @@ public class mInterfaceUtil {
                                 String thumbnail = getFileThumbnail(filePath, extension, context);
                                 callbackContext.success(thumbnail);
                             } else {
-                                callbackContext.error("Failure");
+                                callbackContext.error("DownloadChatAttachment: Failure");
                             }
                         } else {
                             callbackContext.success("success");
@@ -209,7 +212,7 @@ public class mInterfaceUtil {
             byte[] cipherText = android.util.Base64.encode(cipher.doFinal(plainText.getBytes(StandardCharsets.UTF_8)), 0);
             encryptedText = new String(cipherText);
         } catch (Exception E) {
-            System.out.println("decrypt Exception : " + E.getMessage());
+            System.out.println("Failed to decrypt: Exception : " + E.getMessage());
         }
         return encryptedText;
     }
@@ -222,7 +225,7 @@ public class mInterfaceUtil {
         String currentLine, lastKnownLocation = "";
         File locationFile;
         try {
-             locationFile = new File(rootDirectory, "/" + mInterfaceUtil.packageName + "/LastKnownLocation_encrypted.txt");
+            locationFile = new File(rootDirectory, "/" + mInterfaceUtil.packageName + "/LastKnownLocation_encrypted.txt");
             if (locationFile.exists() && !locationFile.isDirectory()) {
                 BufferedReader readerObj = new BufferedReader(new FileReader(locationFile));
                 while ((currentLine = readerObj.readLine()) != null) {
@@ -299,10 +302,10 @@ public class mInterfaceUtil {
             if (filePath.exists()) {
                 filePath.delete();
             } else {
-                callbackContext.error("No file there & File not deleted for " + str);
+                callbackContext.error("No file available & File not deleted for " + str);
             }
         } catch (Exception e) {
-            callbackContext.error(e.getMessage());
+            callbackContext.error("deleteMultipleFiles failed: Exception is : "+e.getMessage());
         }
     }
 
@@ -349,7 +352,7 @@ public class mInterfaceUtil {
             }
             callbackContext.success("success");
         } catch (Exception e) {
-            callbackContext.error(e.getMessage());
+            callbackContext.error("copyConfigFile failed, Exception is" + e.getMessage());
         }
     }
 
@@ -395,7 +398,7 @@ public class mInterfaceUtil {
             }
             callbackContext.success("success");
         } catch (Exception e) {
-            callbackContext.error(e.getMessage());
+            callbackContext.error("copyFile failed exception is : "+e.getMessage());
         }
     }
 
@@ -460,7 +463,7 @@ public class mInterfaceUtil {
             deleteFilesFromDirectory();
             callbackContext.success("success");
         } catch (Exception e) {
-            callbackContext.error(e.getMessage());
+            callbackContext.error("copyAttachmentFile failed, exception is : "+e.getMessage());
         }
     }
 
@@ -508,7 +511,7 @@ public class mInterfaceUtil {
             }
             callbackContext.success("success");
         } catch (Exception e) {
-            callbackContext.error(e.getMessage());
+            callbackContext.error("Move File failed, exception is : "+e.getMessage());
         }
     }
 
@@ -655,7 +658,8 @@ public class mInterfaceUtil {
                 System.out.println("No my accounts file");
             }
         } catch (Exception e) {
-            System.out.println("out exception : " + e.getMessage());
+            callbackContext.error(e.getMessage());
+            System.out.println("Queue processor failed, exception is : "+ e.getMessage());
         }
     }
 
@@ -682,20 +686,24 @@ public class mInterfaceUtil {
 
     @TargetApi(Build.VERSION_CODES.KITKAT)
     public static String getPathToNonPrimaryVolume(Context context, String tag) {
-        File[] volumes = context.getExternalCacheDirs();
-        if (volumes != null) {
-            for (File volume : volumes) {
-                if (volume != null) {
-                    String path = volume.getAbsolutePath();
-                    if (path != null) {
-                        int index = path.indexOf(tag);
-                        if (index != -1) {
-                            return path.substring(0, index) + tag;
+        try {
+            File[] volumes = context.getExternalCacheDirs();
+            if (volumes != null) {
+                for (File volume : volumes) {
+                    if (volume != null) {
+                        String path = volume.getAbsolutePath();
+                        if (path != null) {
+                            int index = path.indexOf(tag);
+                            if (index != -1) {
+                                return path.substring(0, index) + tag;
+                            }
                         }
-                    }
 
+                    }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return null;
     }
@@ -775,21 +783,30 @@ public class mInterfaceUtil {
     }
 
     public void deleteFilesFromDirectory() {
-        File dir = new File(rootDirectory + "/" + mInterfaceUtil.packageName + "/" + "images");
-        if (dir.isDirectory()) {
-            if (dir.exists()) {
-                String[] children = dir.list();
-                for (int i = 0; i < children.length; i++) {
-                    new File(dir, children[i]).delete();
+        try {
+            File dir = new File(rootDirectory + "/" + mInterfaceUtil.packageName + "/" + "images");
+            if (dir.isDirectory()) {
+                if (dir.exists()) {
+                    String[] children = dir.list();
+                    for (int i = 0; i < children.length; i++) {
+                        new File(dir, children[i]).delete();
+                    }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
     public String convertBitmapToString(Bitmap bitmap) {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream);
-        return Base64.encodeToString(outputStream.toByteArray(), Base64.NO_WRAP);
+        try {
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream);
+            return Base64.encodeToString(outputStream.toByteArray(), Base64.NO_WRAP);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "";
     }
 
     public String getFileThumbnail(String filePath, String extension, Context context) {
@@ -1032,9 +1049,13 @@ public class mInterfaceUtil {
     }
 
     private void UpdateProgressBar(CallbackContext callbackContext, int progress) {
-        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, progress);
-        pluginResult.setKeepCallback(true); // keep callback
-        callbackContext.sendPluginResult(pluginResult);
+        try {
+            PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, progress);
+            pluginResult.setKeepCallback(true); // keep callback
+            callbackContext.sendPluginResult(pluginResult);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public String sendFilesToServer(String filePath, String fileName, String requestURL) {
@@ -1126,10 +1147,10 @@ public class mInterfaceUtil {
                 String content = new Scanner(filePath).useDelimiter("\\A").next();
                 callbackContext.success(content);
             } else {
-                callbackContext.error("There is no file at the given path..");
+                callbackContext.error("There is no file at the given path. Path: " + filePath);
             }
         } catch (Exception e) {
-            callbackContext.error(e.getMessage());
+            callbackContext.error("unable to readFile, Exception is: "+e.getMessage());
         }
     }
 
@@ -1141,10 +1162,10 @@ public class mInterfaceUtil {
                 filePath.delete();
                 callbackContext.success();
             } else {
-                callbackContext.error("File not deleted..");
+                callbackContext.error("File not deleted, Path: "+baseDirectory + "/" + args.getJSONObject(0).optString("filePath"));
             }
         } catch (Exception e) {
-            callbackContext.error(e.getMessage());
+            callbackContext.error("delete file failed, exception is : "+e.getMessage());
         }
     }
 
@@ -1166,7 +1187,11 @@ public class mInterfaceUtil {
             fileWriterObj.close();
             callbackContext.success();
         } catch (Exception e) {
-            callbackContext.error(e.getMessage());
+            try {
+                callbackContext.error("create File failed for path:"+ args.getJSONObject(0).optString("filePath") +" , exception is : "+e.getMessage());
+            } catch (JSONException ex) {
+                e.printStackTrace();
+            }
         }
     }
 
@@ -1177,7 +1202,11 @@ public class mInterfaceUtil {
             boolean sss = filePath.exists();
             callbackContext.success(sss ? "true" : "false");
         } catch (Exception e) {
-            callbackContext.error(e.getMessage());
+            try {
+                callbackContext.error("validate file failed for path:"+baseDirectory + "/" + args.getJSONObject(0).optString("filePath")+" , exception is : "+e.getMessage());
+            } catch (JSONException ex) {
+                e.printStackTrace();
+            }
         }
     }
 
@@ -1192,7 +1221,11 @@ public class mInterfaceUtil {
             }
             callbackContext.success();
         } catch (Exception e) {
-            callbackContext.error(e.getMessage());
+            try {
+                callbackContext.error("create directory failed for " + args.getJSONObject(0).optString("filePath") +", exception is : "+e.getMessage());
+            } catch (JSONException ex) {
+                e.printStackTrace();
+            }
         }
     }
 
@@ -1202,31 +1235,39 @@ public class mInterfaceUtil {
         try {
             String fileName = args.getJSONObject(0).optString("filePath");
             if (fileName.equals("")) {
-                callbackContext.error("Given directory path is empty.");
+                callbackContext.error("deleteDirectory: Given directory path is empty. path: "+args.getJSONObject(0).optString("filePath"));
             } else {
                 File dir = new File(rootDirectory + "/" + fileName);
                 if (dir.exists()) {
                     deleteRecursive(dir);
                     callbackContext.success();
                 } else {
-                    callbackContext.error("File does not exists");
+                    callbackContext.error("deleteDirectory: File does not exists in "+args.getJSONObject(0).optString("filePath"));
                 }
 
             }
         } catch (Exception e) {
-            callbackContext.error(e.getMessage());
+            try {
+                callbackContext.error("delete directory failed for "+args.getJSONObject(0).optString("filePath")+", exception is : "+e.getMessage());
+            } catch (JSONException ex) {
+                throw new RuntimeException(ex);
+            }
         }
     }
 
     public void deleteRecursive(File fileOrDirectory) {
-        if (fileOrDirectory.isDirectory()) {
-            for (File child : fileOrDirectory.listFiles()) {
-                System.out.println("Child directory path: " + child);
-                deleteRecursive(child);
+        try {
+            if (fileOrDirectory.isDirectory()) {
+                for (File child : fileOrDirectory.listFiles()) {
+                    System.out.println("Child directory path: " + child);
+                    deleteRecursive(child);
+                }
             }
-        }
 
-        fileOrDirectory.delete();
+            fileOrDirectory.delete();
+        } catch (Exception e) {
+           e.printStackTrace();
+        }
     }
 
     private static final int BUFFER_SIZE = 6 * 1024;
@@ -1267,7 +1308,7 @@ public class mInterfaceUtil {
             callbackContext.success();
         } catch (Exception e) {
             e.printStackTrace();
-            callbackContext.error(e.getMessage());
+            callbackContext.error("unzip failed, exception is : "+e.getMessage());
         }
     }
 
@@ -1293,7 +1334,11 @@ public class mInterfaceUtil {
                 callbackContext.success(fileNames.length() > 0 ? fileNames.substring(0, fileNames.length() - 1) : "");
             }
         } catch (Exception e) {
-            callbackContext.error(e.getMessage());
+            try {
+                callbackContext.error("getSubDirectoryList failed for "+args.getJSONObject(0).optString("filePath")+", exception is : "+e.getMessage());
+            } catch (JSONException ex) {
+                e.printStackTrace();
+            }
         }
     }
 
@@ -1319,7 +1364,11 @@ public class mInterfaceUtil {
                 callbackContext.success(fileNames.length() > 0 ? fileNames.substring(0, fileNames.length() - 1) : "");
             }
         } catch (Exception e) {
-            callbackContext.error(e.getMessage());
+            try {
+                callbackContext.error("getFileList failed for "+args.getJSONObject(0).optString("filePath")+", exception is : "+e.getMessage());
+            } catch (JSONException ex) {
+                e.printStackTrace();
+            }
         }
     }
 
@@ -1359,7 +1408,7 @@ public class mInterfaceUtil {
             }
         } catch (Exception e) {
             System.out.println(e.getMessage());
-            callbackContext.success("");
+            callbackContext.error("getAppStateInfo failed, exception is : "+e.getMessage());
         }
     }
 
@@ -1678,9 +1727,78 @@ public class mInterfaceUtil {
         return true;
     }
 
+
+
     public static boolean isConnected(Context applicationContext) {
-        ConnectivityManager online = (ConnectivityManager) applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkInfo networkInfo = online.getActiveNetworkInfo();
-        return networkInfo != null && networkInfo.isConnected();
+        try {
+            ConnectivityManager online = (ConnectivityManager) applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE);
+            NetworkInfo networkInfo = online.getActiveNetworkInfo();
+            return networkInfo != null && networkInfo.isConnected();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
     }
+
+    public static void appCleanUp(CallbackContext callbackContext, Context applicationContext){
+        try {
+            if (isFirstLaunch(applicationContext)) {
+                performCleanup(applicationContext);
+                setFirstLaunch(applicationContext, false);
+            }
+            callbackContext.success("Success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            callbackContext.error("AppCleanUp Failed, Exception is" + e.getMessage());
+        }
+    }
+
+    private static void performCleanup(Context context) {
+        // Delete files in the internal storage directory
+        File internalFilesDir = context.getFilesDir();
+        deleteDirectory(internalFilesDir);
+        // Delete files in the cache directory
+        File cacheDir = context.getCacheDir();
+        deleteDirectory(cacheDir);
+        // Delete files in the external storage directory
+        File externalFilesDir = context.getExternalFilesDir(null);
+        if (externalFilesDir != null) {
+            deleteDirectory(externalFilesDir);
+        }
+        // Delete files in the external cache directory
+        File externalCacheDir = context.getExternalCacheDir();
+        if (externalCacheDir != null) {
+            deleteDirectory(externalCacheDir);
+        }
+
+    }
+
+    public static boolean isFirstLaunch(Context context) {
+        SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+        return prefs.getBoolean(KEY_FIRST_LAUNCH, true);
+    }
+    public static void setFirstLaunch(Context context, boolean value) {
+        SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putBoolean(KEY_FIRST_LAUNCH, value);
+        editor.apply();
+    }
+    private static void deleteDirectory(File dir) {
+        if (dir != null && dir.isDirectory()) {
+            File[] files = dir.listFiles();
+            if (files != null) {
+                for (File file : files) {
+                    if (file.isDirectory()) {
+                        deleteDirectory(file);
+                    } else {
+                        boolean deleted = file.delete();
+                        if (!deleted) {
+                            Log.e("FileUtils", "Failed to delete file: " + file.getAbsolutePath());
+                        }
+                    }
+                }
+            }
+        }
+    }
+
 }