From 5b827d500d96faa2b390d65d823566cf7b68b8dc Mon Sep 17 00:00:00 2001
From: russa <aaron.russ@dfki.de>
Date: Thu, 8 Oct 2020 21:06:56 +0200
Subject: [PATCH] improve handling for race condition that request finished
 before adding it to pending requests map

---
 .../cordovahttp/CordovaHttpPlugin.java        | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/android/com/silkimen/cordovahttp/CordovaHttpPlugin.java b/src/android/com/silkimen/cordovahttp/CordovaHttpPlugin.java
index 8e9f9e7..245e4b2 100644
--- a/src/android/com/silkimen/cordovahttp/CordovaHttpPlugin.java
+++ b/src/android/com/silkimen/cordovahttp/CordovaHttpPlugin.java
@@ -104,8 +104,7 @@ public class CordovaHttpPlugin extends CordovaPlugin implements Observer {
     CordovaHttpOperation request = new CordovaHttpOperation(method.toUpperCase(), url, headers, timeout, followRedirect,
         responseType, this.tlsConfiguration, observableCallbackContext);
 
-    Future<?> task = cordova.getThreadPool().submit(request);
-    this.addReq(reqId, task, observableCallbackContext);
+    startRequest(reqId, observableCallbackContext, request);
 
     return true;
   }
@@ -127,8 +126,7 @@ public class CordovaHttpPlugin extends CordovaPlugin implements Observer {
     CordovaHttpOperation request = new CordovaHttpOperation(method.toUpperCase(), url, serializer, data, headers,
         timeout, followRedirect, responseType, this.tlsConfiguration, observableCallbackContext);
 
-    Future<?> task = cordova.getThreadPool().submit(request);
-    this.addReq(reqId, task, observableCallbackContext);
+    startRequest(reqId, observableCallbackContext, request);
 
     return true;
   }
@@ -148,8 +146,7 @@ public class CordovaHttpPlugin extends CordovaPlugin implements Observer {
     CordovaHttpUpload upload = new CordovaHttpUpload(url, headers, filePaths, uploadNames, timeout, followRedirect,
         responseType, this.tlsConfiguration, this.cordova.getActivity().getApplicationContext(), observableCallbackContext);
 
-    Future<?> task = cordova.getThreadPool().submit(upload);
-    this.addReq(reqId, task, observableCallbackContext);
+    startRequest(reqId, observableCallbackContext, upload);
 
     return true;
   }
@@ -167,12 +164,19 @@ public class CordovaHttpPlugin extends CordovaPlugin implements Observer {
     CordovaHttpDownload download = new CordovaHttpDownload(url, headers, filePath, timeout, followRedirect,
         this.tlsConfiguration, observableCallbackContext);
 
-    Future<?> task = cordova.getThreadPool().submit(download);
-    this.addReq(reqId, task, observableCallbackContext);
+    startRequest(reqId, observableCallbackContext, download);
 
     return true;
   }
 
+  private void startRequest(Integer reqId, CordovaObservableCallbackContext observableCallbackContext, CordovaHttpBase request) {
+    synchronized (reqMapLock) {
+      observableCallbackContext.setObserver(this);
+      Future<?> task = cordova.getThreadPool().submit(request);
+      this.addReq(reqId, task, observableCallbackContext);
+    }
+  }
+
   private boolean setServerTrustMode(final JSONArray args, final CallbackContext callbackContext) throws JSONException {
     CordovaServerTrust runnable = new CordovaServerTrust(args.getString(0), this.cordova.getActivity(),
         this.tlsConfiguration, callbackContext);
@@ -212,12 +216,7 @@ public class CordovaHttpPlugin extends CordovaPlugin implements Observer {
 
   private void addReq(final Integer reqId, final Future<?> task, final CordovaObservableCallbackContext observableCallbackContext) {
     synchronized (reqMapLock) {
-      // NOTE there is a small chance that the task may already have tried to remove itself before
-      //      done-status was set (within the request run-thread)
-      //      to prevent that, the synchronized()-lock would need to be set around starting the
-      //      request and adding the entry to reqMap (which seems overkill given that is seems very unlikely)
       if(!task.isDone()){
-        observableCallbackContext.setObserver(this);
         this.reqMap.put(reqId, task);
       }
     }