Merge pull request #371 from wordpress-mobile/issue/370-timeout-uploa…

…ding-media Media uploading first fix
wordpress-mobile · Mar 17, 2017 · 7f4e5df · 7f4e5df
2 parents 9459756 + a1bd7e5
commit 7f4e5df
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/network/BaseRequest.java b/fluxc/src/main/java/org/wordpress/android/fluxc/network/BaseRequest.java
@@ -25,6 +25,7 @@
 
 public abstract class BaseRequest<T> extends Request<T> {
     public static final int DEFAULT_REQUEST_TIMEOUT = 30000;
+    public static final int UPLOAD_REQUEST_READ_TIMEOUT = 60000;
     public Uri mUri;
 
     public interface OnAuthFailedListener {

diff --git a/...c/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/MediaRestClient.java b/...c/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/MediaRestClient.java
@@ -70,7 +70,7 @@ public MediaRestClient(Context appContext, Dispatcher dispatcher, RequestQueue r
         super(appContext, dispatcher, requestQueue, accessToken, userAgent);
         mOkHttpClient = okClientBuilder
                 .connectTimeout(BaseRequest.DEFAULT_REQUEST_TIMEOUT, TimeUnit.MILLISECONDS)
-                .readTimeout(BaseRequest.DEFAULT_REQUEST_TIMEOUT, TimeUnit.MILLISECONDS)
+                .readTimeout(BaseRequest.UPLOAD_REQUEST_READ_TIMEOUT, TimeUnit.MILLISECONDS)
                 .writeTimeout(BaseRequest.DEFAULT_REQUEST_TIMEOUT, TimeUnit.MILLISECONDS)
                 .build();
     }

diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/media/MediaXMLRPCClient.java b/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/media/MediaXMLRPCClient.java
@@ -67,7 +67,7 @@ public MediaXMLRPCClient(Dispatcher dispatcher, RequestQueue requestQueue, OkHtt
         super(dispatcher, requestQueue, accessToken, userAgent, httpAuthManager);
         mOkHttpClient = okClientBuilder
                 .connectTimeout(BaseRequest.DEFAULT_REQUEST_TIMEOUT, TimeUnit.MILLISECONDS)
-                .readTimeout(BaseRequest.DEFAULT_REQUEST_TIMEOUT, TimeUnit.MILLISECONDS)
+                .readTimeout(BaseRequest.UPLOAD_REQUEST_READ_TIMEOUT, TimeUnit.MILLISECONDS)
                 .writeTimeout(BaseRequest.DEFAULT_REQUEST_TIMEOUT, TimeUnit.MILLISECONDS)
                 .build();
     }