cordova-plugin-mserviceinterface-2.0 1.0.103 → 1.0.105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.103",
+  "version": "1.0.105",
   "description": "This plugin establishes the connection to the native interface and performs the requested task.",
   "main": "index.js",
   "scripts": {
@@ -25,4 +25,4 @@
       "version": ">=5.0.0"
     }
   ]
-}
+}

package/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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.103">
+    xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mserviceinterface-2.0" version="1.0.105">
     <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>
@@ -15,10 +15,6 @@
     <js-module src="www/mInterface.js" name="mInterface">
         <clobbers target="mInterface" />
     </js-module>
-    <js-module src="www/mServiceAppLink.js" name="mServiceAppLink">
-        <runs />
-    </js-module>
-    <hook type="after_prepare" src="scripts/mservice-deeplink-setup.js" />
     <platform name="android">
         <framework src="src/android/doubleogradle.gradle" custom="true" type="gradleReference"/>
         <framework src="androidx.camera:camera-core:1.5.0" />
@@ -46,6 +42,7 @@
         <config-file target="AndroidManifest.xml" parent="/manifest">
             <uses-feature android:name="android.hardware.camera" android:required="true" />
             <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+            <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
             <uses-permission android:name="android.permission.INTERNET" />
             <uses-permission android:name="android.permission.CAMERA" />
             <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -63,18 +60,14 @@
             </queries>
         </config-file>
         <config-file target="AndroidManifest.xml" parent="/manifest/application">
-            <activity android:name="com.selfservit.util.CameraActivity" android:configChanges="orientation|screenSize" android:screenOrientation="portrait" android:exported="true" android:theme="@style/CameraTheme" />
-            <service android:name="com.selfservit.util.mInterfaceService" android:foregroundServiceType="location" android:enabled="true" android:exported="true"/>
-            <receiver android:name="com.selfservit.util.mInterfaceReceiver" android:enabled="true" android:exported="true">
+            <activity android:name="com.selfservit.util.CameraActivity" android:configChanges="orientation|screenSize" android:screenOrientation="portrait" android:exported="false" android:theme="@style/CameraTheme" />
+            <service android:name="com.selfservit.util.mInterfaceService" android:foregroundServiceType="location" android:enabled="true" android:exported="false"/>
+            <receiver android:name="com.selfservit.util.mInterfaceReceiver" android:enabled="true" android:exported="false">
                 <intent-filter>
                     <action android:name="android.intent.action.BOOT_COMPLETED"/>
-                    <action android:name="com.example.checkservice" />
                 </intent-filter>
             </receiver>
-            <receiver android:enabled="true" android:exported="true" android:name="com.selfservit.util.GeofenceBroadcastReceiver">
-                <intent-filter>
-                    <action android:name="com.google.android.gms.location.GeofenceEvent" />
-                </intent-filter>
+            <receiver android:enabled="true" android:exported="false" android:name="com.selfservit.util.GeofenceBroadcastReceiver">
             </receiver>
             <provider android:name="com.selfservit.util.FileProvider" android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true">
                 <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/opener_paths" />
@@ -83,6 +76,7 @@
         <source-file src="src/android/mInterfaceService.java" target-dir="src/com/selfservit/util/" />
         <source-file src="src/android/mInterfaceReceiver.java" target-dir="src/com/selfservit/util/" />
         <source-file src="src/android/mInterface.java" target-dir="src/com/selfservit/util/" />
+        <source-file src="src/android/AttachmentFileIO.java" target-dir="src/com/selfservit/util/" />
         <source-file src="src/android/CameraActivity.java" target-dir="src/com/selfservit/util/" />
         <source-file src="src/android/GeofenceBroadcastReceiver.java" target-dir="src/com/selfservit/util/" />
         <source-file src="src/android/mInterfaceUtil.java" target-dir="src/com/selfservit/util/" />

package/src/android/GeofenceBroadcastReceiver.java

@@ -1,19 +1,16 @@
 package com.selfservit.util;
 
-import android.Manifest;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.os.Build;
 import android.util.Log;
 import android.widget.Toast;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
-import androidx.core.content.ContextCompat;
 
 import com.google.android.gms.location.Geofence;
 import com.google.android.gms.location.GeofencingEvent;
@@ -25,7 +22,6 @@ import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
-import java.util.List;
 import java.util.UUID;
 
 public class GeofenceBroadcastReceiver extends BroadcastReceiver {
@@ -35,76 +31,29 @@ public class GeofenceBroadcastReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (intent == null) {
-            Log.w(TAG, "Ignoring null geofence intent");
-            return;
-        }
-        GeofencingEvent geofencingEvent;
-        String enterMessage;
-        String exitMessage;
-        try {
-            geofencingEvent = GeofencingEvent.fromIntent(intent);
-            enterMessage = intent.getStringExtra("enterMessage");
-            exitMessage = intent.getStringExtra("exitMessage");
-        } catch (RuntimeException e) {
-            Log.e(TAG, "Ignoring malformed geofence intent", e);
-            return;
-        }
+        GeofencingEvent geofencingEvent = GeofencingEvent.fromIntent(intent);
 
-        if (geofencingEvent == null) {
-            Log.w(TAG, "Ignoring intent without a geofencing event");
-            return;
-        }
         if (geofencingEvent.hasError()) {
             Log.e(TAG, "GeofencingEvent error: " + geofencingEvent.getErrorCode());
             return;
         }
+        String enterMessage = intent.getStringExtra("enterMessage");
+        String exitMessage = intent.getStringExtra("exitMessage");
         int geofenceTransition = geofencingEvent.getGeofenceTransition();
         if (geofenceTransition == Geofence.GEOFENCE_TRANSITION_ENTER ||
                 geofenceTransition == Geofence.GEOFENCE_TRANSITION_EXIT) {
             String transitionType = geofenceTransition == Geofence.GEOFENCE_TRANSITION_ENTER ? "enter" : "exit";
-            List<Geofence> triggeringGeofences = geofencingEvent.getTriggeringGeofences();
-            if (triggeringGeofences == null || triggeringGeofences.isEmpty()) {
-                Log.w(TAG, "Ignoring event without triggering geofences");
-                return;
-            }
 
-            for (Geofence geofence : triggeringGeofences) {
-                if (geofence == null) {
-                    Log.w(TAG, "Ignoring null triggering geofence");
-                    continue;
-                }
+            for (Geofence geofence : geofencingEvent.getTriggeringGeofences()) {
                 String geofenceId = geofence.getRequestId();
-                if (!isValidGeofenceId(geofenceId)) {
-                    Log.w(TAG, "Ignoring geofence with an invalid request ID");
-                    continue;
-                }
                 writeEventToJsonFile(context, geofenceId, transitionType);
+                createNotificationChannel(context);
                 String message = (transitionType.equals("enter") ? enterMessage : exitMessage);
                 sendNotification(context, "GeoFence", message);
 //                showToast(context, "Geofence " + transitionType + ": " + geofenceId);
             }
         }
     }
-
-    private static boolean isValidGeofenceId(String geofenceId) {
-        if (geofenceId == null) return false;
-        String[] parameters = geofenceId.split("--", -1);
-        if (parameters.length < 4) return false;
-        for (String parameter : parameters) {
-            if (parameter.isEmpty() || parameter.equals(".") || parameter.equals("..")) {
-                return false;
-            }
-            for (int i = 0; i < parameter.length(); i++) {
-                char character = parameter.charAt(i);
-                if (character == '/' || character == '\\' || Character.isISOControl(character)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
     private void showToast(Context context, String message) {
         //Toast.makeText(context.getApplicationContext(), message, Toast.LENGTH_LONG).show();
     }
@@ -114,23 +63,18 @@ public class GeofenceBroadcastReceiver extends BroadcastReceiver {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("eventName", eventType);
             jsonObject.put("geofenceID", geofenceId);
-            String[] parameters = geofenceId.split("--", -1);
-            fileDirectory = context.getExternalFilesDir("");
-            if (fileDirectory == null) {
-                Log.w(TAG, "External app storage is unavailable for geofence event");
-                return;
-            }
-            for (int i = 0; i < 4; i++) {
-                fileDirectory = new File(fileDirectory, parameters[i]);
-            }
-            fileDirectory = new File(fileDirectory, "geofence");
-            if (!fileDirectory.isDirectory() && !fileDirectory.mkdirs()) {
-                throw new IOException("Unable to create geofence event directory");
-            }
+            String[] parameters = geofenceId.split("--");
+            fileDirectory = new File(new File(context.getExternalFilesDir(""), "") + "/" + parameters[0] + "/" + parameters[1] + "/" + parameters[2] + "/" + parameters[3] + "/" + "geofence");
+            if (!fileDirectory.exists()) {
+                boolean success = fileDirectory.mkdirs();
+                if (!success) {
+                    System.out.println("Directory not created");
+                }
+            };
             notificationsFile = new File(fileDirectory, geofenceId + "--" + eventType + ".json");
-            try (FileWriter fw = new FileWriter(notificationsFile)) {
-                fw.write(mInterfaceUtil.encrypt(jsonObject.toString()));
-            }
+            FileWriter fw = new FileWriter(notificationsFile);
+            fw.write(mInterfaceUtil.encrypt(jsonObject.toString()));
+            fw.close();
             Log.i(TAG, "Event written to file: " + geofenceId + ".json");
         } catch (Exception e) {
             Log.e(TAG, "Error writing event to JSON file", e);
@@ -139,26 +83,6 @@ public class GeofenceBroadcastReceiver extends BroadcastReceiver {
 
     private void sendNotification(Context context, String title, String message) {
         try {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
-                && ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS)
-                != PackageManager.PERMISSION_GRANTED) {
-            Log.i(TAG, "Skipping geofence notification; notification permission is not granted");
-            return;
-        }
-        if (!NotificationManagerCompat.from(context).areNotificationsEnabled()) {
-            Log.i(TAG, "Skipping geofence notification; notifications are disabled");
-            return;
-        }
-        NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        if (notificationManager == null) return;
-        createNotificationChannel(context);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channel = notificationManager.getNotificationChannel(CHANNEL_ID);
-            if (channel != null && channel.getImportance() == NotificationManager.IMPORTANCE_NONE) {
-                Log.i(TAG, "Skipping geofence notification; notification channel is disabled");
-                return;
-            }
-        }
         String notification_icon, notification_color, app_name;
         int imageResource,notification_color_id;
         String packageName = context.getPackageName();
@@ -180,17 +104,12 @@ public class GeofenceBroadcastReceiver extends BroadcastReceiver {
                 .setAutoCancel(true)
                 .setColor(context.getResources().getColor(notification_color_id))
                 .setContentIntent(pendingIntent);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channel = new NotificationChannel(CHANNEL_ID, "Channel human readable title", NotificationManager.IMPORTANCE_DEFAULT);
-            notificationManager.createNotificationChannel(channel);
-        }
+        NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+
         int notificationId = UUID.randomUUID().hashCode();
         notificationManager.notify(notificationId, notificationBuilder.build());
         } catch (ClassNotFoundException e) {
-            Log.e(TAG, "Unable to open the app from geofence notification", e);
-        } catch (RuntimeException e) {
-            // Permission or notification settings can change after the checks above.
-            Log.e(TAG, "Unable to show geofence notification", e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -202,9 +121,7 @@ public class GeofenceBroadcastReceiver extends BroadcastReceiver {
             NotificationChannel channel = new NotificationChannel(CHANNEL_ID, name, importance);
             channel.setDescription(description);
             NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
-            if (notificationManager != null) {
-                notificationManager.createNotificationChannel(channel);
-            }
+            notificationManager.createNotificationChannel(channel);
         }
     }
 }

package/src/android/doubleogradle.gradle

@@ -3,8 +3,4 @@ android {
         multiDexEnabled true
 
     }
-	 compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
-	}
 }