commit 3ccf9f8462c1de61c15c3841f77010b25fd6de58
author Vladimir Kotikov <kotikov.vladimir@gmail.com> Thu Aug 18 16:30:19 2016 +0300
committer Vladimir Kotikov <kotikov.vladimir@gmail.com> Thu Aug 18 16:34:18 2016 +0300
tree b6fc01be75c7247dc7ad548f7f9d668b5294e9d6
parent 9dc41bd4e97eafe80fb9bc6573396fcab5967708

CB-9022 Resolve source URI on background thread

We should call remapUri on background thread otherwise it
throws IllegalStateException when trying to remap  'cdvfile://localhost/content/...' URIs via ContentFilesystem

src/android/FileTransfer.java

diff --git a/src/android/FileTransfer.java b/src/android/FileTransfer.java
index 86176a2..6c5b883 100644
--- a/src/android/FileTransfer.java
+++ b/src/android/FileTransfer.java
@@ -305,10 +305,6 @@
         Log.d(LOG_TAG, "httpMethod: " + httpMethod);
 
         final Uri targetUri = resourceApi.remapUri(Uri.parse(target));
-        // Accept a path or a URI for the source.
-        Uri tmpSrc = Uri.parse(source);
-        final Uri sourceUri = resourceApi.remapUri(
-            tmpSrc.getScheme() != null ? tmpSrc : Uri.fromFile(new File(source)));
 
         int uriType = CordovaResourceApi.getUriType(targetUri);
         final boolean useHttps = uriType == CordovaResourceApi.URI_TYPE_HTTPS;
@@ -329,6 +325,14 @@
                 if (context.aborted) {
                     return;
                 }
+
+                // We should call remapUri on background thread otherwise it throws
+                // IllegalStateException when trying to remap 'cdvfile://localhost/content/...' URIs
+                // via ContentFilesystem (see https://issues.apache.org/jira/browse/CB-9022)
+                Uri tmpSrc = Uri.parse(source);
+                final Uri sourceUri = resourceApi.remapUri(
+                        tmpSrc.getScheme() != null ? tmpSrc : Uri.fromFile(new File(source)));
+
                 HttpURLConnection conn = null;
                 HostnameVerifier oldHostnameVerifier = null;
                 SSLSocketFactory oldSocketFactory = null;
@@ -686,7 +690,7 @@
             if(body != null)
             {
                 error.put("body", body);
-            }   
+            }
             if (httpStatus != null) {
                 error.put("http_status", httpStatus);
             }