flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2026-08-14 18:02:58 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
jabarros
2014-10-20 14:44:34 +02:00
parent 6491ae18c3 d709798359
commit 5bd0d73877
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/owncloud/android/lib/common/utils/Log_OC.java
-1
View File
@@ -175,5 +175,4 @@ public class Log_OC {
public static String[] getLogFileNames() {
return mLogFileNames;
}
}
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;