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

Merge branch 'develop' into forbidden_characters_from_server

Browse Source 
Conflicts:
	src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
	src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
This commit is contained in:
masensio
2015-06-15 14:41:27 +02:00
parent 4ca0ff2203 639cb7eacd
commit 060ca75f17
7 changed files with 212 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+1 -3
View File
@@ -103,9 +103,7 @@ public class GetRemoteStatusOperation extends RemoteOperation {
);
get.releaseConnection();
get = new GetMethod(redirectedLocation);
status = client.executeMethod(
get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT
);
status = client.executeMethod(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT);
mLatestResult = new RemoteOperationResult(
(status == HttpStatus.SC_OK),
status,