diff --git a/library/src/androidTest/java/com/owncloud/android/FileIT.java b/library/src/androidTest/java/com/owncloud/android/FileIT.java index 2cadacc7c..1c75ea5b9 100644 --- a/library/src/androidTest/java/com/owncloud/android/FileIT.java +++ b/library/src/androidTest/java/com/owncloud/android/FileIT.java @@ -126,7 +126,7 @@ public void testShareViaLinkSharees() { false, "", OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + .execute(client).isSuccess()); // verify RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client); @@ -167,7 +167,7 @@ public void testShareToGroupSharees() { false, "", OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + .execute(client).isSuccess()); // verify RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client); @@ -202,7 +202,7 @@ public void testOneSharees() { false, "", OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + .execute(client).isSuccess()); // verify RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client); @@ -239,7 +239,7 @@ public void testTwoShareesOnParent() { false, "", OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + .execute(client).isSuccess()); assertTrue(new CreateShareRemoteOperation(path, ShareType.USER, @@ -247,7 +247,7 @@ public void testTwoShareesOnParent() { false, "", OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + .execute(client).isSuccess()); // verify RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client); @@ -287,7 +287,7 @@ public void testTwoSharees() { false, "", OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + .execute(client).isSuccess()); assertTrue(new CreateShareRemoteOperation(path, ShareType.USER, @@ -295,7 +295,7 @@ public void testTwoSharees() { false, "", OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + .execute(client).isSuccess()); // verify RemoteOperationResult result = new ReadFolderRemoteOperation(path).execute(client); diff --git a/library/src/androidTest/java/com/owncloud/android/lib/common/operations/CreateShareIT.java b/library/src/androidTest/java/com/owncloud/android/lib/common/operations/CreateShareIT.java index d4a327a64..fe9e5cc9e 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/common/operations/CreateShareIT.java +++ b/library/src/androidTest/java/com/owncloud/android/lib/common/operations/CreateShareIT.java @@ -56,7 +56,7 @@ public void testCreatePublicShareSuccessful() { "", false, "", - 1).execute(client); + 1).execute(client); assertTrue(result.isSuccess()); } @@ -67,7 +67,7 @@ public void testCreatePublicShareFailure() { "", false, "", - 1).execute(client); + 1).execute(client); assertFalse(result.isSuccess()); assertEquals(ResultCode.FILE_NOT_FOUND, result.getCode()); @@ -83,7 +83,7 @@ public void testCreatePrivateShareWithUserSuccessful() { "admin", false, "", - 31).execute(client); + 31).execute(client); assertTrue(result.isSuccess()); } @@ -97,7 +97,7 @@ public void testCreatePrivateShareWithUserNotExists() { "no_exist", false, "", - 31).execute(client); + 31).execute(client); assertFalse(result.isSuccess()); // TODO 404 is File not found, but actually it is "user not found" @@ -114,7 +114,7 @@ public void testCreatePrivateShareWithFileNotExists() { "admin", false, "", - 31).execute(client); + 31).execute(client); assertFalse(result.isSuccess()); assertEquals(ResultCode.FILE_NOT_FOUND, result.getCode()); } @@ -129,7 +129,7 @@ public void testCreatePrivateShareWithGroupSuccessful() { "admin", false, "", - 1).execute(client); + 1).execute(client); assertTrue(result.isSuccess()); } @@ -143,7 +143,7 @@ public void testCreatePrivateShareWithNonExistingGroupSharee() { "no_exist", false, "", - 31).execute(client); + 31).execute(client); assertFalse(result.isSuccess()); // TODO 404 is File not found, but actually it is "user not found" @@ -160,7 +160,7 @@ public void testCreatePrivateShareWithNonExistingFile() { "admin", false, "", - 31).execute(client); + 31).execute(client); assertFalse(result.isSuccess()); assertEquals(ResultCode.FILE_NOT_FOUND, result.getCode()); } @@ -189,7 +189,7 @@ public void testCreateFederatedShareWithNonExistingSharee() { "no_exist@" + serverUri2, false, "", - 31).execute(client); + 31).execute(client); assertFalse("sharee doesn't exist in an existing remote server", result.isSuccess()); assertEquals("sharee doesn't exist in an existing remote server, forbidden", @@ -206,7 +206,7 @@ public void testCreateFederatedShareWithNonExistingRemoteServer() { "no_exist", false, "", - 31).execute(client); + 31).execute(client); assertFalse(result.isSuccess()); // TODO expected: but was: assertEquals("remote server doesn't exist", ResultCode.SHARE_FORBIDDEN, result.getCode()); @@ -222,7 +222,7 @@ public void testCreateFederatedShareWithNonExistingFile() { "admin@" + serverUri2, false, "", - 31).execute(client); + 31).execute(client); assertFalse("file doesn't exist", result.isSuccess()); assertEquals("file doesn't exist", ResultCode.FILE_NOT_FOUND, result.getCode()); diff --git a/library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetSharesIT.java b/library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetSharesIT.java index 5a8061708..55d72ca41 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetSharesIT.java +++ b/library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetSharesIT.java @@ -36,7 +36,7 @@ public void testGetShares() { "", false, "", - 1).execute(client).isSuccess()); + 1).execute(client).isSuccess()); assertTrue(new CreateFolderRemoteOperation("/2/", true).execute(client).isSuccess()); assertTrue(new CreateShareRemoteOperation("/2/", @@ -44,7 +44,7 @@ public void testGetShares() { "", false, "", - 1).execute(client).isSuccess()); + 1).execute(client).isSuccess()); RemoteOperationResult> result = new GetSharesRemoteOperation().execute(client); assertTrue(result.isSuccess()); diff --git a/library/src/androidTest/java/com/owncloud/android/lib/common/operations/RemoveShareIT.java b/library/src/androidTest/java/com/owncloud/android/lib/common/operations/RemoveShareIT.java index 70171e560..f7986b37d 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/common/operations/RemoveShareIT.java +++ b/library/src/androidTest/java/com/owncloud/android/lib/common/operations/RemoveShareIT.java @@ -42,7 +42,7 @@ public void testRemoveShare() throws IOException { ShareType.PUBLIC_LINK, "", false, - "", 1).execute(client); + "", 1).execute(client); assertTrue(result.isSuccess()); diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java index f16c50e8d..4004ae1bc 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java @@ -177,7 +177,7 @@ public void favoriteFiles() throws IOException { client.getUserId(), false, "", - 31).execute(client2) + 31).execute(client2) .isSuccess() ); diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperationIT.java index 58ed2ac25..2d173ad2a 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperationIT.java +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperationIT.java @@ -53,30 +53,30 @@ public void searchSharedFiles() { // share folder to user "admin" assertTrue(new CreateShareRemoteOperation("/shareToAdmin/", - ShareType.USER, - "admin", - false, - "", - OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER) - .execute(client).isSuccess()); + ShareType.USER, + "admin", + false, + "", + OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER) + .execute(client).isSuccess()); // share folder via public link assertTrue(new CreateShareRemoteOperation("/shareViaLink/", - ShareType.PUBLIC_LINK, - "", - true, - "", - OCShare.READ_PERMISSION_FLAG) - .execute(client).isSuccess()); + ShareType.PUBLIC_LINK, + "", + true, + "", + OCShare.READ_PERMISSION_FLAG) + .execute(client).isSuccess()); // share folder to group assertTrue(new CreateShareRemoteOperation("/shareToGroup/", - ShareType.GROUP, - "users", - false, - "", - OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + ShareType.GROUP, + "users", + false, + "", + OCShare.NO_PERMISSION) + .execute(client).isSuccess()); // share folder to circle // get share @@ -169,12 +169,12 @@ public void sharedWithMe() { // share folder to user "admin" assertTrue(new CreateFolderRemoteOperation("/shareToAdmin/", true).execute(client).isSuccess()); assertTrue(new CreateShareRemoteOperation("/shareToAdmin/", - ShareType.USER, - "admin", - false, - "", - OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER) - .execute(client).isSuccess()); + ShareType.USER, + "admin", + false, + "", + OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER) + .execute(client).isSuccess()); // Expect one file shared by me, no file shared with me result = sut.execute(client); @@ -196,12 +196,12 @@ public void sharedWithMe() { // share folder to previous user assertTrue(new CreateFolderRemoteOperation("/shareToUser/", true).execute(clientUser1).isSuccess()); assertTrue(new CreateShareRemoteOperation("/shareToUser/", - ShareType.USER, - client.getCredentials().getUsername(), - false, - "", - OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER) - .execute(clientUser1).isSuccess()); + ShareType.USER, + client.getCredentials().getUsername(), + false, + "", + OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER) + .execute(clientUser1).isSuccess()); // Expect one file shared by me, one file shared with me result = sut.execute(client); @@ -225,7 +225,7 @@ public void favorites() { "", OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER, true) - .execute(client); + .execute(client); assertTrue(createResult.isSuccess()); @@ -243,7 +243,7 @@ public void favorites() { "", OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER, true) - .execute(client); + .execute(client); assertTrue(createResult.isSuccess()); @@ -269,7 +269,7 @@ public void noFavorite() { "", OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER, true) - .execute(client); + .execute(client); assertTrue(createResult.isSuccess()); @@ -299,7 +299,7 @@ public void favorite() { "", OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER, true) - .execute(client); + .execute(client); assertTrue(createResult.isSuccess()); diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/GetMetadataRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/GetMetadataRemoteOperation.java index 2d666baa3..18f0f931a 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/GetMetadataRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/GetMetadataRemoteOperation.java @@ -7,6 +7,8 @@ */ package com.owncloud.android.lib.resources.e2ee; +import com.nextcloud.common.NextcloudClient; +import com.nextcloud.operations.GetMethod; import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; @@ -14,7 +16,6 @@ import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.HttpStatus; -import org.apache.commons.httpclient.methods.GetMethod; import org.json.JSONObject; @@ -50,19 +51,19 @@ public GetMetadataRemoteOperation(long fileId) { */ @Override protected RemoteOperationResult run(OwnCloudClient client) { - GetMethod getMethod = null; + org.apache.commons.httpclient.methods.GetMethod getMethod = null; RemoteOperationResult result; try { // remote request - getMethod = new GetMethod(client.getBaseUri() + METADATA_V2_URL + fileId + JSON_FORMAT); + getMethod = new org.apache.commons.httpclient.methods.GetMethod(client.getBaseUri() + METADATA_V2_URL + fileId + JSON_FORMAT); getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE); int status = client.executeMethod(getMethod, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT); if (status == HttpStatus.SC_NOT_FOUND || status == HttpStatus.SC_INTERNAL_SERVER_ERROR) { // retry with v1 - getMethod = new GetMethod(client.getBaseUri() + METADATA_V1_URL + fileId + JSON_FORMAT); + getMethod = new org.apache.commons.httpclient.methods.GetMethod(client.getBaseUri() + METADATA_V1_URL + fileId + JSON_FORMAT); getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE); status = client.executeMethod(getMethod, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT); @@ -77,6 +78,61 @@ protected RemoteOperationResult run(OwnCloudClient client) { signature = signatureHeader.getValue(); } + // Parse the response + JSONObject respJSON = new JSONObject(response); + String metadata = respJSON + .getJSONObject(NODE_OCS) + .getJSONObject(NODE_DATA) + .getString(NODE_META_DATA); + + MetadataResponse metadataResponse = new MetadataResponse(signature, metadata); + + result = new RemoteOperationResult<>(true, getMethod); + result.setResultData(metadataResponse); + } else { + result = new RemoteOperationResult<>(false, getMethod); + client.exhaustResponse(getMethod.getResponseBodyAsStream()); + } + } catch (Exception e) { + result = new RemoteOperationResult<>(e); + Log_OC.e(TAG, "Fetching of metadata for folder " + fileId + " failed: " + + result.getLogMessage(), result.getException()); + } finally { + if (getMethod != null) + getMethod.releaseConnection(); + } + return result; + } + + /** + * @param client Client object + */ + @Override + public RemoteOperationResult run(NextcloudClient client) { + com.nextcloud.operations.GetMethod getMethod = null; + RemoteOperationResult result; + + try { + // remote request + getMethod = new com.nextcloud.operations.GetMethod(client.getBaseUri() + METADATA_V2_URL + fileId + JSON_FORMAT, true); + + int status = client.execute(getMethod); + + if (status == HttpStatus.SC_NOT_FOUND || status == HttpStatus.SC_INTERNAL_SERVER_ERROR) { + // retry with v1 + getMethod = new GetMethod(client.getBaseUri() + METADATA_V1_URL + fileId + JSON_FORMAT, true); + + status = client.execute(getMethod); + } + + if (status == HttpStatus.SC_OK) { + String response = getMethod.getResponseBodyAsString(); + String signature = getMethod.getResponseHeader(HEADER_SIGNATURE); + + if (signature == null) { + signature = ""; + } + // Parse the response JSONObject respJSON = new JSONObject(response); String metadata = respJSON @@ -90,7 +146,6 @@ protected RemoteOperationResult run(OwnCloudClient client) { result.setResultData(metadataResponse); } else { result = new RemoteOperationResult<>(false, getMethod); - client.exhaustResponse(getMethod.getResponseBodyAsStream()); } } catch (Exception e) { result = new RemoteOperationResult<>(e); diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/LockFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/LockFileRemoteOperation.java index 27a265f7e..00fe794cc 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/LockFileRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/LockFileRemoteOperation.java @@ -7,6 +7,8 @@ */ package com.owncloud.android.lib.resources.e2ee; +import com.nextcloud.common.NextcloudClient; +import com.nextcloud.operations.PostMethod; import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; @@ -16,6 +18,8 @@ import org.apache.commons.httpclient.methods.Utf8PostMethod; import org.json.JSONObject; +import okhttp3.RequestBody; + /** * Lock a file @@ -69,6 +73,54 @@ protected RemoteOperationResult run(OwnCloudClient client) { int status = client.executeMethod(postMethod, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT); + if (status == HttpStatus.SC_OK) { + String response = postMethod.getResponseBodyAsString(); + + // Parse the response + JSONObject respJSON = new JSONObject(response); + String token = respJSON + .getJSONObject(NODE_OCS) + .getJSONObject(NODE_DATA) + .getString(E2E_TOKEN); + + result = new RemoteOperationResult<>(true, postMethod); + result.setResultData(token); + } else { + result = new RemoteOperationResult<>(false, postMethod); + client.exhaustResponse(postMethod.getResponseBodyAsStream()); + } + } catch (Exception e) { + result = new RemoteOperationResult<>(e); + Log_OC.e(TAG, "Lock file with id " + localId + " failed: " + result.getLogMessage(), result.getException()); + } finally { + if (postMethod != null) { + postMethod.releaseConnection(); + } + } + return result; + } + + /** + * @param client Client object + */ + @Override + public RemoteOperationResult run(NextcloudClient client) { + RemoteOperationResult result; + PostMethod postMethod = null; + + try { + RequestBody requestBody = RequestBody.create(new byte[] {}); + + postMethod = new PostMethod(client.getBaseUri() + LOCK_FILE_URL + localId + JSON_FORMAT, true, requestBody); + + postMethod.addRequestHeader(CONTENT_TYPE, FORM_URLENCODED); + + if (counter > 0) { + postMethod.addRequestHeader(COUNTER_HEADER, String.valueOf(counter)); + } + + int status = client.execute(postMethod); + if (status == HttpStatus.SC_OK) { String response = postMethod.getResponseBodyAsString(); @@ -83,7 +135,6 @@ protected RemoteOperationResult run(OwnCloudClient client) { result.setResultData(token); } else { result = new RemoteOperationResult<>(false, postMethod); - client.exhaustResponse(postMethod.getResponseBodyAsStream()); } } catch (Exception e) { result = new RemoteOperationResult<>(e); diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UnlockFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UnlockFileRemoteOperation.java index db110881e..601971552 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UnlockFileRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UnlockFileRemoteOperation.java @@ -7,13 +7,14 @@ */ package com.owncloud.android.lib.resources.e2ee; +import com.nextcloud.common.NextcloudClient; +import com.nextcloud.operations.DeleteMethod; import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.utils.Log_OC; import org.apache.commons.httpclient.HttpStatus; -import org.apache.commons.httpclient.methods.DeleteMethod; /** @@ -43,11 +44,11 @@ public UnlockFileRemoteOperation(long localId, String token) { @Override protected RemoteOperationResult run(OwnCloudClient client) { RemoteOperationResult result; - DeleteMethod deleteMethod = null; + org.apache.commons.httpclient.methods.DeleteMethod deleteMethod = null; try { // remote request - deleteMethod = new DeleteMethod(client.getBaseUri() + LOCK_FILE_URL + localId); + deleteMethod = new org.apache.commons.httpclient.methods.DeleteMethod(client.getBaseUri() + LOCK_FILE_URL + localId); deleteMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE); deleteMethod.addRequestHeader(CONTENT_TYPE, FORM_URLENCODED); deleteMethod.addRequestHeader(E2E_TOKEN, token); @@ -55,8 +56,36 @@ protected RemoteOperationResult run(OwnCloudClient client) { int status = client.executeMethod(deleteMethod, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT); result = new RemoteOperationResult<>(status == HttpStatus.SC_OK, deleteMethod); - + client.exhaustResponse(deleteMethod.getResponseBodyAsStream()); + } catch (Exception e) { + result = new RemoteOperationResult<>(e); + Log_OC.e(TAG, "Unlock file with id " + localId + " failed: " + result.getLogMessage(), + result.getException()); + } finally { + if (deleteMethod != null) + deleteMethod.releaseConnection(); + } + return result; + } + + /** + * @param client Client object + */ + @Override + public RemoteOperationResult run(NextcloudClient client) { + RemoteOperationResult result; + com.nextcloud.operations.DeleteMethod deleteMethod = null; + + try { + // remote request + deleteMethod = new DeleteMethod(client.getBaseUri() + LOCK_FILE_URL + localId, true); + deleteMethod.addRequestHeader(CONTENT_TYPE, FORM_URLENCODED); + deleteMethod.addRequestHeader(E2E_TOKEN, token); + + int status = client.execute(deleteMethod); + + result = new RemoteOperationResult<>(status == HttpStatus.SC_OK, deleteMethod); } catch (Exception e) { result = new RemoteOperationResult<>(e); Log_OC.e(TAG, "Unlock file with id " + localId + " failed: " + result.getLogMessage(), diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java index 32270bc7a..dac141ca5 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java @@ -24,12 +24,14 @@ * @author David A. Velasco */ public class ExistenceCheckRemoteOperation extends RemoteOperation { - - /** Maximum time to wait for a response from the server in MILLISECONDs. */ + + /** + * Maximum time to wait for a response from the server in MILLISECONDs. + */ public static final int TIMEOUT = 50000; private static final String TAG = ExistenceCheckRemoteOperation.class.getSimpleName(); - + private String mPath; private boolean mSuccessIfAbsent; @@ -63,7 +65,7 @@ public ExistenceCheckRemoteOperation(String remotePath, Context context, boolean } @Override - protected RemoteOperationResult run(OwnCloudClient client) { + protected RemoteOperationResult run(OwnCloudClient client) { RemoteOperationResult result = null; HeadMethod head = null; boolean previousFollowRedirects = client.isFollowRedirects(); diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/RenameFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/RenameFileRemoteOperation.java index ec3300f0e..79d92543b 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/files/RenameFileRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/files/RenameFileRemoteOperation.java @@ -76,7 +76,7 @@ protected RemoteOperationResult run(OwnCloudClient client) { // check if a file with the new name already exists RemoteOperationResult existenceResult = new ExistenceCheckRemoteOperation(mNewRemotePath, false) - .execute(client); + .execute(client); if (existenceResult.isSuccess()) { return new RemoteOperationResult(ResultCode.INVALID_OVERWRITE); } diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java index 0ef9a46e9..3515c0be9 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java @@ -166,7 +166,7 @@ protected RemoteOperationResult> run(OwnCloudClient client) { String response = post.getResponseBodyAsString(); ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser( - new ShareXMLParser() + new ShareXMLParser() ); parser.setOneOrMoreSharesRequired(true); parser.setServerBaseUri(client.getBaseUri()); diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java index b579e65ba..620a8fd1f 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java @@ -68,8 +68,8 @@ protected RemoteOperationResult run(OwnCloudClient client) { get.setQueryString(new NameValuePair[]{ new NameValuePair(PARAM_PATH, mRemoteFilePath), new NameValuePair(PARAM_RESHARES, String.valueOf(mReshares)), - new NameValuePair(PARAM_SUBFILES, String.valueOf(mSubfiles)) //, - //new NameValuePair("shared_with_me", "true") + new NameValuePair(PARAM_SUBFILES, String.valueOf(mSubfiles)) //, + //new NameValuePair("shared_with_me", "true") }); get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE); diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperation.java index 5e5090a66..586b7fde0 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperation.java @@ -10,6 +10,8 @@ */ package com.owncloud.android.lib.resources.shares; +import static com.owncloud.android.lib.resources.shares.ShareUtils.INCLUDE_TAGS; + import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; @@ -20,8 +22,6 @@ import java.util.List; -import static com.owncloud.android.lib.resources.shares.ShareUtils.INCLUDE_TAGS; - /** * Get the data from the server about ALL the known shares owned by the requester. */ diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperation.java index 830a67724..5cbef9655 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperation.java @@ -199,9 +199,9 @@ protected RemoteOperationResult> run(OwnCloudClient client) { put = new PutMethod(uriString); put.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE); put.setRequestEntity(new StringRequestEntity( - parameter.first + "=" + parameter.second, - ENTITY_CONTENT_TYPE, - ENTITY_CHARSET + parameter.first + "=" + parameter.second, + ENTITY_CONTENT_TYPE, + ENTITY_CHARSET )); status = client.executeMethod(put); diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/GetStatusRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/status/GetStatusRemoteOperation.java index 423abcbe3..dbc828378 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/status/GetStatusRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/status/GetStatusRemoteOperation.java @@ -172,9 +172,9 @@ private boolean tryConnection(OwnCloudClient client) { private boolean isOnline() { ConnectivityManager cm = (ConnectivityManager) mContext - .getSystemService(Context.CONNECTIVITY_SERVICE); + .getSystemService(Context.CONNECTIVITY_SERVICE); return cm != null && cm.getActiveNetworkInfo() != null - && cm.getActiveNetworkInfo().isConnectedOrConnecting(); + && cm.getActiveNetworkInfo().isConnectedOrConnecting(); } @Override