cordova-plugin-mserviceinterface-2.0 1.0.103 → 1.0.104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.103",
+  "version": "1.0.104",
   "description": "This plugin establishes the connection to the native interface and performs the requested task.",
   "main": "index.js",
   "scripts": {

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.104">
     <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>
@@ -46,6 +46,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,23 +64,20 @@
             </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"/>
+            <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="true">
                 <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" />
             </provider>
         </config-file>
+        <source-file src="src/android/AttachmentFileIO.java" target-dir="src/com/selfservit/util/" />
         <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/" />

package/scripts/mservice-deeplink-setup.js

@@ -166,6 +166,58 @@ function setActivityAttribute(openingTag, attributeName, attributeValue) {
     );
 }
 
+function isMatchingAndroidAppLink(filter, configuration) {
+    function attributes(tag) {
+        var values = {};
+        var pattern = /([\w:.-]+)\s*=\s*(["'])([\s\S]*?)\2/g;
+        var match;
+        while ((match = pattern.exec(tag)) !== null) {
+            values[match[1]] = match[3].replace(
+                /&(#x[0-9a-f]+|#\d+|amp|quot|apos|lt|gt);/gi,
+                function (entity, value) {
+                    if (value.charAt(0) === "#") {
+                        return String.fromCodePoint(value.charAt(1).toLowerCase() === "x"
+                            ? parseInt(value.slice(2), 16) : parseInt(value.slice(1), 10));
+                    }
+                    return {amp: "&", quot: '"', apos: "'", lt: "<", gt: ">"}[value];
+                }
+            );
+        }
+        return values;
+    }
+
+    var content = filter.replace(/<!--[\s\S]*?-->/g, "");
+    var opening = content.match(/<intent-filter\b[^>]*>/i);
+    var filterAttributes = opening ? attributes(opening[0]) : {};
+    // Preserve filters with extra behavior, such as priority or additional data.
+    if (Object.keys(filterAttributes).some(function (key) { return key !== "android:autoVerify"; })) {
+        return false;
+    }
+    var body = content.replace(/^\s*<intent-filter\b[^>]*>/i, "").replace(/<\/intent-filter>\s*$/i, "");
+    var tags = body.match(/<(?:action|category|data)\b[^>]*\/\s*>/gi) || [];
+    if (tags.length !== 4 || body.replace(/<(?:action|category|data)\b[^>]*\/\s*>/gi, "").trim() !== "") {
+        return false;
+    }
+    var actions = [], categories = [], data = [];
+    tags.forEach(function (tag) {
+        var values = attributes(tag);
+        if (/^<data\b/i.test(tag)) {
+            data.push(values);
+        } else if (Object.keys(values).length === 1 && values["android:name"]) {
+            if (/^<action\b/i.test(tag)) actions.push(values["android:name"]);
+            else categories.push(values["android:name"]);
+        }
+    });
+    return actions.length === 1 && actions[0] === "android.intent.action.VIEW"
+        && categories.length === 2
+        && categories.indexOf("android.intent.category.DEFAULT") !== -1
+        && categories.indexOf("android.intent.category.BROWSABLE") !== -1
+        && data.length === 1 && Object.keys(data[0]).length === 3
+        && data[0]["android:scheme"] === configuration.scheme
+        && data[0]["android:host"] === configuration.host
+        && data[0]["android:path"] === configuration.path;
+}
+
 function configureAndroidAppLink(projectRoot, configuration) {
     var manifestPath;
     var manifestContent;
@@ -243,22 +295,21 @@ function configureAndroidAppLink(projectRoot, configuration) {
         "        <!-- MService App Link - END -->\n";
 
     markerPattern =
-        /\s*<!-- MService App Link - START -->[\s\S]*?<!-- MService App Link - END -->\s*/i;
-
-    /*
-     * Replace an existing hook-generated filter when configuration changes.
-     */
-    if (markerPattern.test(updatedActivityBlock)) {
-        updatedActivityBlock = updatedActivityBlock.replace(
-            markerPattern,
-            intentFilter
-        );
-    } else {
-        updatedActivityBlock = updatedActivityBlock.replace(
-            /<\/activity>\s*$/i,
-            intentFilter + "    </activity>"
-        );
-    }
+        /\s*<!-- MService App Link - START -->[\s\S]*?<!-- MService App Link - END -->\s*/gi;
+
+    // Cordova can discard comments when rewriting XML. Remove both marked
+    // blocks and equivalent unmarked filters before inserting one definition.
+    updatedActivityBlock = updatedActivityBlock.replace(markerPattern, "\n");
+    updatedActivityBlock = updatedActivityBlock.replace(
+        /\s*<intent-filter\b[^>]*>[\s\S]*?<\/intent-filter>/gi,
+        function (filter) {
+            return isMatchingAndroidAppLink(filter, configuration) ? "" : filter;
+        }
+    );
+    updatedActivityBlock = updatedActivityBlock.replace(
+        /\s*<\/activity>\s*$/i,
+        intentFilter + "    </activity>"
+    );
 
     manifestContent = manifestContent.replace(
         activityPattern,

package/src/android/GeofenceBroadcastReceiver.java

@@ -180,10 +180,6 @@ 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);
-        }
         int notificationId = UUID.randomUUID().hashCode();
         notificationManager.notify(notificationId, notificationBuilder.build());
         } catch (ClassNotFoundException e) {

package/src/android/doubleogradle.gradle

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

package/src/android/mInterface.java

@@ -26,6 +26,7 @@ import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.location.Location;
+import android.location.LocationManager;
 import android.media.MediaMetadataRetriever;
 import android.media.ThumbnailUtils;
 import android.net.ConnectivityManager;
@@ -35,6 +36,9 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.SystemClock;
 import android.provider.MediaStore;
 import android.provider.OpenableColumns;
 import android.provider.Settings;
@@ -50,9 +54,13 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.app.ActivityCompat;
+import androidx.core.location.LocationManagerCompat;
 import androidx.exifinterface.media.ExifInterface;
 
 import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
+import com.google.android.gms.location.CurrentLocationRequest;
+import com.google.android.gms.tasks.CancellationTokenSource;
 import com.google.android.gms.common.api.GoogleApiClient;
 import com.google.android.gms.common.api.PendingResult;
 import com.google.android.gms.common.api.ResultCallback;
@@ -140,7 +148,6 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
     private static final String PORTRAIT = "portrait";
     private static final String LANDSCAPE = "landscape";
     private static final String ANDROID_PLATFORM = "Android";
-    String currentLocationInd = "";
     Location mCurrentLocation1;
     LocationRequest mLocationRequest1;
     GoogleApiClient mGoogleApiClient1;
@@ -174,6 +181,8 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
 
     @Override
     public void onDestroy() {
+        locationPluginDestroyed = true;
+        cancelCurrentLocationRequest();
         mInterfaceService.stopIfNotTracking(cordova.getActivity());
         if (mGoogleApiClient1 != null) {
             if (mGoogleApiClient1.isConnected()) {
@@ -184,6 +193,12 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
         super.onDestroy();
     }
 
+    @Override
+    public void onReset() {
+        cancelCurrentLocationRequest();
+        super.onReset();
+    }
+
     @RequiresApi(api = Build.VERSION_CODES.O)
     @Override
     public boolean execute(final String action, JSONArray args, final CallbackContext callbackContext) throws JSONException {
@@ -489,6 +504,10 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     String str = "false";
                     if (isServiceRunning(mInterfaceService.class)) {
                         str = "true";
+                        // Legacy JS skips StartService when this returns true.
+                        // Recheck an existing queue-only/tracking service here,
+                        // preserving the callback contract and eligibility guards.
+                        mInterfaceService.start(cordova.getActivity());
                         System.out.println("service check is: " + str + " " + isServiceRunning(mInterfaceService.class));
                     }
                     callbackContext.success(str);
@@ -622,19 +641,8 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     callbackContext.error(e.getMessage());
                 }
             } else if ("GetCurrentLocation".equals(action)) {
-                try {
-                    currentLocationInd = "true";
-                    callback = callbackContext;
-                    createLocationRequest1();
-                    this.mGoogleApiClient1 = new GoogleApiClient.Builder(cordova.getActivity())
-                            .addConnectionCallbacks(this)
-                            .addOnConnectionFailedListener(this)
-                            .addApi(LocationServices.API)
-                            .build();
-                    mGoogleApiClient1.connect();
-                } catch (Exception e) {
-                    callbackContext.error(e.getMessage());
-                }
+                getCurrentLocation(callbackContext);
+                return true;
             } else if (action.equals("GetSyncIndicator")) {
                 try {
                     File newQueueFolder, oldQueueFolder;
@@ -1494,6 +1502,122 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
         return false;
     }
 
+    private static final long CURRENT_LOCATION_TIMEOUT_MS = 10_000L;
+    private static final String CURRENT_LOCATION_TIMEOUT_ERROR = "Unable to obtain current location within 10 seconds";
+    private final Handler currentLocationHandler = new Handler(Looper.getMainLooper());
+    private CurrentLocationOperation currentLocationOperation;
+    private volatile boolean locationPluginDestroyed;
+
+    private void getCurrentLocation(final CallbackContext resultCallback) {
+        final long deadline = SystemClock.elapsedRealtime() + CURRENT_LOCATION_TIMEOUT_MS;
+        currentLocationHandler.post(() -> {
+            if (locationPluginDestroyed) {
+                resultCallback.error("Current location request cancelled: plugin destroyed");
+                return;
+            }
+            if (currentLocationOperation != null) {
+                resultCallback.error("A current location request is already in progress");
+                return;
+            }
+            CurrentLocationOperation operation = new CurrentLocationOperation(resultCallback, deadline);
+            currentLocationOperation = operation;
+            operation.start();
+        });
+    }
+
+    private void cancelCurrentLocationRequest() {
+        currentLocationHandler.post(() -> {
+            if (currentLocationOperation != null) {
+                currentLocationOperation.finish(null, "Current location request cancelled");
+            }
+        });
+    }
+
+    // All request state and completion listeners run on the main looper. This
+    // callback is separate from the shared camera/scanner/GPS-settings callback.
+    private final class CurrentLocationOperation {
+        private final CallbackContext resultCallback;
+        private final long deadline;
+        private final CancellationTokenSource cancellation = new CancellationTokenSource();
+        private final Runnable timeout = () -> finish(null, CURRENT_LOCATION_TIMEOUT_ERROR);
+        private boolean completed;
+
+        CurrentLocationOperation(CallbackContext resultCallback, long deadline) {
+            this.resultCallback = resultCallback;
+            this.deadline = deadline;
+        }
+
+        void start() {
+            long remaining = deadline - SystemClock.elapsedRealtime();
+            if (remaining <= 0) {
+                finish(null, CURRENT_LOCATION_TIMEOUT_ERROR);
+                return;
+            }
+            currentLocationHandler.postDelayed(timeout, remaining);
+            try {
+                Context context = cordova.getActivity().getApplicationContext();
+                if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED
+                        && ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                    finish(null, "Location permission not granted");
+                    return;
+                }
+                LocationManager manager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+                if (manager == null || !LocationManagerCompat.isLocationEnabled(manager)) {
+                    finish(null, "Device location is disabled");
+                    return;
+                }
+                if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) != ConnectionResult.SUCCESS) {
+                    finish(null, "Google Play services is unavailable");
+                    return;
+                }
+                remaining = deadline - SystemClock.elapsedRealtime();
+                if (remaining <= 0) {
+                    finish(null, CURRENT_LOCATION_TIMEOUT_ERROR);
+                    return;
+                }
+                CurrentLocationRequest request = new CurrentLocationRequest.Builder()
+                        .setPriority(Priority.PRIORITY_HIGH_ACCURACY)
+                        .setMaxUpdateAgeMillis(0)
+                        .setDurationMillis(remaining)
+                        .build();
+                // No network precondition: a satellite fix can be available offline.
+                LocationServices.getFusedLocationProviderClient(context)
+                        .getCurrentLocation(request, cancellation.getToken())
+                        .addOnSuccessListener(location -> finish(location,
+                                location == null ? "Current location is unavailable" : null))
+                        .addOnFailureListener(error -> finish(null,
+                                "Unable to obtain current location: " + error.getMessage()))
+                        .addOnCanceledListener(() -> finish(null, "Current location request cancelled"));
+            } catch (Exception error) {
+                finish(null, "Unable to obtain current location: " + error.getMessage());
+            }
+        }
+
+        void finish(Location location, String error) {
+            if (completed) return;
+            completed = true;
+            currentLocationHandler.removeCallbacks(timeout);
+            if (currentLocationOperation == this) currentLocationOperation = null;
+            // Cancels outstanding acquisition on timeout/reset and releases the
+            // one-shot request on every terminal path. Late results are ignored.
+            try {
+                cancellation.cancel();
+            } catch (RuntimeException cancellationError) {
+                Log.w(TAG, "Unable to cancel current location acquisition", cancellationError);
+            }
+            if (SystemClock.elapsedRealtime() >= deadline) {
+                location = null;
+                error = CURRENT_LOCATION_TIMEOUT_ERROR;
+            }
+            if (location != null) {
+                resultCallback.success(location.getLatitude() + "," + location.getLongitude());
+            } else {
+                resultCallback.error(error);
+            }
+        }
+    }
+
+
     public void createLocationRequest1() {
         try {
             mLocationRequest1 = new LocationRequest();
@@ -2585,36 +2709,31 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             final Status status = locationSettingsResult.getStatus();
             switch (status.getStatusCode()) {
                 case LocationSettingsStatusCodes.SUCCESS:
+                    callback.success();
                     break;
                 case LocationSettingsStatusCodes.RESOLUTION_REQUIRED:
                     try {
                         this.cordova.setActivityResultCallback(this);
                         status.startResolutionForResult(this.cordova.getActivity(), LOCATION_ACCURACY_REQUEST_NEW);
                     } catch (IntentSender.SendIntentException e) {
-                        System.out.println("PendingIntent unable to execute request: ");
+                        callback.error("Unable to open location settings: " + e.getMessage());
                     }
                     break;
                 case LocationSettingsStatusCodes.SETTINGS_CHANGE_UNAVAILABLE:
-                    System.out.println("Location settings are inadequate, and cannot be fixed here. Dialog not created.");
+                    callback.error("Location settings cannot be changed on this device");
+                    break;
+                default:
+                    callback.error("Unable to check location settings: " + status.getStatusCode());
                     break;
             }
         } catch (Exception e) {
-            System.out.println("LocationSettingsResult failed, exception is : " + e.getMessage());
+            callback.error("LocationSettingsResult failed, exception is : " + e.getMessage());
         }
     }
 
     @Override
     public void onLocationChanged(@NonNull Location location) {
         mCurrentLocation1 = location;
-        try {
-            System.out.println(mCurrentLocation1.getLatitude() + "," + mCurrentLocation1.getLongitude());
-            if (currentLocationInd.equals("true")) {
-                currentLocationInd = "";
-                callback.success(mCurrentLocation1.getLatitude() + "," + mCurrentLocation1.getLongitude());
-            }
-        } catch (Exception e) {
-            callback.error("onLocationChanged failed, exception is : " + e.getMessage());
-        }
     }
 
     private class DownloadTask extends AsyncTask<String, Integer, String> {

package/src/android/mInterfaceUtil.java

@@ -838,133 +838,164 @@ public class mInterfaceUtil {
         return imgString;
     }
 
-    public void sendChatAttachment(String filePath, String fileName, String requestURL, Context context, CallbackContext callbackContext) {
-        try {
-            class SendFile extends AsyncTask<String, String, String> {
-                @Override
-                protected void onPreExecute() {
-                }
+    private static final int CHAT_UPLOAD_CONNECT_TIMEOUT_MS = 30_000;
+    private static final int CHAT_UPLOAD_READ_TIMEOUT_MS = 60_000;
+    private static final long CHAT_UPLOAD_TIMEOUT_MS = 5 * 60_000L;
 
-                @Override
-                protected String doInBackground(String... args) {
-                    FileInputStream fileInputStream;
-                    HttpURLConnection urlConObj;
-                    URL requestPath;
-                    int bytesAvailable,
-                            bufferSize;
-                    int maxBufferSize = 1 * 1024 * 1024;
-                    DataOutputStream dos;
-                    String lineEnd = "\r\n";
-                    String twoHyphens = "--";
-                    String boundary = "*****";
-                    StringBuilder serverResponseObj;
-                    BufferedReader readerObj;
-                    String currentLine,
-                            receiveData = "", statusIndication = null;
-                    int progressCheck = 10;
-                    try {
-                        if (new File(filePath).exists()) {
-                            if (new File(filePath).exists()) {
-                                fileInputStream = new FileInputStream(new File(filePath));
-
-                                requestPath = new URL((requestURL).replaceAll(" ", "%20"));
-                                urlConObj = (HttpURLConnection) requestPath.openConnection();
-                                urlConObj.setDoInput(true); // Allow Inputs
-                                urlConObj.setDoOutput(true); // Allow Outputs
-                                urlConObj.setUseCaches(false); // Don't use a Cached Copy
-                                urlConObj.setRequestMethod("POST");
-                                urlConObj.setRequestProperty("Connection", "Keep-Alive");
-                                urlConObj.setRequestProperty("ENCTYPE", "multipart/form-data");
-                                urlConObj.setRequestProperty("Content-Type", "multipart/form-data;boundary=" + boundary);
-                                urlConObj.setRequestProperty("uploaded_file", fileName);
-
-                                dos = new DataOutputStream(urlConObj.getOutputStream());
-                                dos.writeBytes(twoHyphens + boundary + lineEnd);
-                                dos.writeBytes("Content-Disposition: form-data; name=\"uploaded_file\";filename=\""
-                                        + fileName + "\"" + lineEnd);
-                                dos.writeBytes(lineEnd);
-                                // create a buffer of  maximum size
-                                bytesAvailable = fileInputStream.available();
-
-                                bufferSize = Math.min(bytesAvailable, maxBufferSize);
-
-                                int progress = 0;
-                                int progressToSend = 0;
-                                int fileLength = (int) new File(filePath).length();
-                                int bytesReadValue = 0;
-                                byte[] buf = new byte[1024];
-                                BufferedInputStream bufInput = new BufferedInputStream(new FileInputStream(new File(filePath)));
-                                while ((bytesReadValue = bufInput.read(buf)) != -1) {
-                                    // write output
-                                    dos.write(buf, 0, bytesReadValue);
-                                    progress += bytesReadValue;
-                                    progressToSend = (int) ((progress * 100) / fileLength);
-
-                                    if (progressToSend >= progressCheck) {
-                                        JSONObject progressObj = new JSONObject();
-                                        progressObj.put("progress", progressCheck);
-                                        progressObj.put("fileLength", fileLength);
-                                        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, progressObj);
-                                        pluginResult.setKeepCallback(true);
-                                        callbackContext.sendPluginResult(pluginResult);
-                                        progressCheck = progressCheck + 10;
-                                    }
-                                }
+    public void sendChatAttachment(String filePath, String fileName, String requestURL, Context context, CallbackContext callbackContext) {
+        new ChatAttachmentUpload(filePath, fileName, requestURL, callbackContext).start();
+    }
 
-                                // send multipart form data necesssary after file data...
-                                dos.writeBytes(lineEnd);
-                                dos.writeBytes(twoHyphens + boundary + twoHyphens + lineEnd);
-                                urlConObj.getResponseCode();
-                                //close the streams //
-                                fileInputStream.close();
-                                dos.flush();
-                                dos.close();
-                                readerObj = new BufferedReader(new InputStreamReader(urlConObj.getInputStream()));
-                                currentLine = readerObj.readLine();
-                                readerObj.close();
-                                receiveData = currentLine;
-                                urlConObj.disconnect();
-                                JSONObject resultObj = new JSONObject(receiveData);
-                                if (resultObj.getString("status").equalsIgnoreCase("success")) {
-                                    statusIndication = "true";
-                                } else {
-                                    statusIndication = "false";
-                                }
-                                urlConObj.disconnect();
-                            }
-                        }
+    // Own the callback for the whole request, including progress, timeout and cleanup.
+    private static final class ChatAttachmentUpload implements Runnable {
+        private final String filePath;
+        private final String fileName;
+        private final String requestURL;
+        private final CallbackContext callback;
+        private volatile boolean finished;
+        private volatile HttpURLConnection connection;
+        private java.util.Timer timeout;
+        private long startedAt;
+
+        ChatAttachmentUpload(String filePath, String fileName, String requestURL, CallbackContext callback) {
+            this.filePath = filePath;
+            this.fileName = fileName;
+            this.requestURL = requestURL;
+            this.callback = callback;
+        }
 
-                    } catch (Exception e) {
-                        e.printStackTrace();
+        void start() {
+            try {
+                startedAt = android.os.SystemClock.elapsedRealtime();
+                timeout = new java.util.Timer("ChatAttachmentTimeout", true);
+                timeout.schedule(new java.util.TimerTask() {
+                    @Override public void run() {
+                        finish(false, "request timed out");
+                        // Timer runs off the UI thread; disconnect can block on some devices.
+                        disconnect();
                     }
-                    return statusIndication;
+                }, CHAT_UPLOAD_TIMEOUT_MS);
+                AsyncTask.THREAD_POOL_EXECUTOR.execute(this);
+            } catch (Exception e) {
+                finish(false, "could not start upload");
+            }
+        }
+
+        private synchronized void finish(boolean success, String reason) {
+            if (finished) return;
+            if (android.os.SystemClock.elapsedRealtime() - startedAt >= CHAT_UPLOAD_TIMEOUT_MS) {
+                success = false;
+                reason = "request timed out";
+            }
+            finished = true;
+            if (timeout != null) timeout.cancel();
+            // Do not log the URL, local path, file contents or server response.
+            if (!success) Log.w("mInterfaceChatUpload", reason);
+            if (success) callback.success("success");
+            else callback.error("failure");
+        }
+
+        private synchronized void progress(int percent, long length) throws JSONException {
+            if (finished) return;
+            JSONObject value = new JSONObject();
+            value.put("progress", percent);
+            value.put("fileLength", length);
+            PluginResult result = new PluginResult(PluginResult.Status.OK, value);
+            result.setKeepCallback(true);
+            callback.sendPluginResult(result);
+        }
 
+        private void disconnect() {
+            HttpURLConnection active = connection;
+            if (active != null) {
+                try {
+                    active.disconnect();
+                } catch (Exception ignored) {
+                    // Cleanup must never prevent delivery of the terminal callback.
                 }
+            }
+        }
 
-                public void onPostExecute(String statusIndication) {
-                    try {
-                        if (statusIndication == null) {
-                            callbackContext.error("failure");
-                        } else {
-                            if (statusIndication.equals("true")) {
-                                callbackContext.success("success");
-                            } else {
-                                callbackContext.error("failure");
-                            }
+        @Override public void run() {
+            try {
+                if (finished) return;
+                File file = new File(filePath);
+                if (!file.isFile() || !file.canRead()) {
+                    finish(false, "attachment is not readable");
+                    return;
+                }
+                String boundary = "*****";
+                byte[] header = ("--" + boundary + "\r\n"
+                        + "Content-Disposition: form-data; name=\"uploaded_file\";filename=\""
+                        + fileName.replace("\r", "").replace("\n", "").replace("\"", "_") + "\"\r\n\r\n")
+                        .getBytes(StandardCharsets.UTF_8);
+                byte[] footer = ("\r\n--" + boundary + "--\r\n").getBytes(StandardCharsets.UTF_8);
+                long length = file.length();
+                HttpURLConnection active = (HttpURLConnection) new URL(requestURL.replace(" ", "%20")).openConnection();
+                connection = active;
+                if (finished) return;
+                active.setConnectTimeout(CHAT_UPLOAD_CONNECT_TIMEOUT_MS);
+                active.setReadTimeout(CHAT_UPLOAD_READ_TIMEOUT_MS);
+                active.setDoInput(true);
+                active.setDoOutput(true);
+                active.setUseCaches(false);
+                active.setRequestMethod("POST");
+                active.setRequestProperty("Content-Type", "multipart/form-data;boundary=" + boundary);
+                active.setRequestProperty("uploaded_file", fileName);
+
+                // Finish and close the request body BEFORE asking for the HTTP response.
+                try (InputStream input = new BufferedInputStream(new FileInputStream(file));
+                     OutputStream output = active.getOutputStream()) {
+                    output.write(header);
+                    byte[] buffer = new byte[16 * 1024];
+                    long sent = 0;
+                    int count;
+                    int nextProgress = 10;
+                    while ((count = input.read(buffer)) != -1) {
+                        if (finished) return;
+                        output.write(buffer, 0, count);
+                        sent += count;
+                        int percent = length == 0 ? 100 : (int) (sent * 100.0 / length);
+                        while (nextProgress <= 100 && percent >= nextProgress) {
+                            progress(nextProgress, length);
+                            nextProgress += 10;
                         }
-                    } catch (Exception e) {
-                        e.printStackTrace();
                     }
+                    if (finished) return;
+                    output.write(footer);
+                    output.flush();
+                }
 
+                if (finished) return;
+                int status = active.getResponseCode();
+                if (status < 200 || status >= 300) {
+                    finish(false, "HTTP " + status);
+                    return;
+                }
+                StringBuilder response = new StringBuilder();
+                try (InputStreamReader reader = new InputStreamReader(active.getInputStream(), StandardCharsets.UTF_8)) {
+                    char[] buffer = new char[4096];
+                    int count;
+                    while ((count = reader.read(buffer)) != -1) {
+                        if (finished) return;
+                        if (response.length() + count > 1024 * 1024) {
+                            throw new IOException("Upload response too large");
+                        }
+                        response.append(buffer, 0, count);
+                    }
                 }
+                String body = response.toString().trim();
+                if (body.startsWith("\uFEFF")) body = body.substring(1).trim();
+                boolean success = "success".equalsIgnoreCase(new JSONObject(body).optString("status"));
+                finish(success, "server did not confirm success");
+            } catch (Exception e) {
+                finish(false, "upload failed: " + e.getClass().getSimpleName());
+            } finally {
+                disconnect();
             }
-            new SendFile().execute();
-        } catch (Exception e) {
-            e.printStackTrace();
         }
     }
 
-
     public String sendAttachmentToServer(String filePath, String fileName, String requestURL) {
         String statusIndication = "false";
         try {

package/src/android/res/layout/activity_camera.xml

@@ -22,6 +22,16 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"/>
 
+    <!-- Only the controls receive system-bar/cutout padding; the preview fills the window. -->
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cameraControls"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
     <ImageButton
         android:id="@+id/torchButton"
         android:layout_width="56dp"
@@ -61,4 +71,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/captureButton" />
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>