flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2026-08-20 12:52:53 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of github.com:owncloud/android-library into buildsystem/gradle_develop

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
Marcello Steiner
2014-11-21 12:44:23 +01:00
committed by MMMarcy
parent 04299bdf3c 2799b3e853
commit ef768b7d1b
25 changed files with 468 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
+1 -1
View File
@@ -48,7 +48,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
public class ReadRemoteFileOperation extends RemoteOperation {
private static final String TAG = ReadRemoteFileOperation.class.getSimpleName();
private static final int SYNC_READ_TIMEOUT = 10000;
private static final int SYNC_READ_TIMEOUT = 40000;
private static final int SYNC_CONNECTION_TIMEOUT = 5000;
private String mRemotePath;