diff --git a/library/src/androidTest/java/com/owncloud/android/AbstractIT.java b/library/src/androidTest/java/com/owncloud/android/AbstractIT.java index 629747cce3..a8210ea45c 100644 --- a/library/src/androidTest/java/com/owncloud/android/AbstractIT.java +++ b/library/src/androidTest/java/com/owncloud/android/AbstractIT.java @@ -70,6 +70,7 @@ public abstract class AbstractIT { public static OwnCloudClient client; public static OwnCloudClient client2; protected static NextcloudClient nextcloudClient; + protected static NextcloudClient nextcloudClient2; protected static Context context; protected static Uri url; @@ -109,6 +110,10 @@ public static void beforeAll() throws InterruptedException, String credentials = Credentials.basic(loginName, password); nextcloudClient = new NextcloudClient(url, userId, credentials, context); + String userId2 = loginName; // for test same as userId + String credentials2 = Credentials.basic(loginName2, password2); + nextcloudClient2 = new NextcloudClient(url, userId2, credentials2, context); + waitForServer(client, url); testConnection(); } @@ -144,7 +149,7 @@ private static void testConnection() throws KeyStoreException, InterruptedException { GetStatusRemoteOperation getStatus = new GetStatusRemoteOperation(context); - RemoteOperationResult result = getStatus.execute(client); + RemoteOperationResult result = getStatus.execute(nextcloudClient); if (result.isSuccess()) { Log_OC.d("AbstractIT", "Connection to server successful"); diff --git a/library/src/androidTest/java/com/owncloud/android/FileIT.java b/library/src/androidTest/java/com/owncloud/android/FileIT.java index 2cadacc7c5..65bae644a5 100644 --- a/library/src/androidTest/java/com/owncloud/android/FileIT.java +++ b/library/src/androidTest/java/com/owncloud/android/FileIT.java @@ -7,10 +7,6 @@ */ package com.owncloud.android; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import android.net.Uri; import com.owncloud.android.lib.common.operations.RemoteOperationResult; @@ -31,6 +27,10 @@ import java.util.ArrayList; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * Tests related to file operations */ @@ -126,7 +126,7 @@ public void testShareViaLinkSharees() { false, "", OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + .execute(nextcloudClient).isSuccess()); // verify RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client); @@ -167,7 +167,7 @@ public void testShareToGroupSharees() { false, "", OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + .execute(nextcloudClient).isSuccess()); // verify RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client); @@ -202,7 +202,7 @@ public void testOneSharees() { false, "", OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + .execute(nextcloudClient).isSuccess()); // verify RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client); @@ -239,7 +239,7 @@ public void testTwoShareesOnParent() { false, "", OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + .execute(nextcloudClient).isSuccess()); assertTrue(new CreateShareRemoteOperation(path, ShareType.USER, @@ -247,7 +247,7 @@ public void testTwoShareesOnParent() { false, "", OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + .execute(nextcloudClient).isSuccess()); // verify RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client); @@ -287,7 +287,7 @@ public void testTwoSharees() { false, "", OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + .execute(nextcloudClient).isSuccess()); assertTrue(new CreateShareRemoteOperation(path, ShareType.USER, @@ -295,7 +295,7 @@ public void testTwoSharees() { false, "", OCShare.NO_PERMISSION) - .execute(client).isSuccess()); + .execute(nextcloudClient).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 d4a327a643..fe9e5cc9e8 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 5a80617087..55d72ca411 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 70171e560e..f7986b37d8 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/RenameFileRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/RenameFileRemoteOperationIT.kt index 63237f70fd..42c0695e03 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/RenameFileRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/RenameFileRemoteOperationIT.kt @@ -32,8 +32,8 @@ class RenameFileRemoteOperationIT : AbstractIT() { .isSuccess ) - assertFalse(ExistenceCheckRemoteOperation(oldRemotePath, false).execute(client).isSuccess) - assertTrue(ExistenceCheckRemoteOperation(newRemotePath, false).execute(client).isSuccess) + assertFalse(ExistenceCheckRemoteOperation(oldRemotePath, false).execute(nextcloudClient).isSuccess) + assertTrue(ExistenceCheckRemoteOperation(newRemotePath, false).execute(nextcloudClient).isSuccess) } @Test 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 f16c50e8da..4004ae1bcf 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 58ed2ac252..95dcfcd09c 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(nextcloudClient); assertTrue(createResult.isSuccess()); diff --git a/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java b/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java index 3d10638ee6..7b7c13039c 100644 --- a/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java +++ b/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java @@ -21,6 +21,7 @@ import android.text.TextUtils; import com.nextcloud.common.DNSCache; +import com.nextcloud.common.NextcloudClient; import com.nextcloud.common.NextcloudUriDelegate; import com.owncloud.android.lib.common.accounts.AccountUtils; import com.owncloud.android.lib.common.network.AdvancedX509KeyManager; @@ -67,6 +68,8 @@ public class OwnCloudClient extends HttpClient { private AdvancedX509KeyManager keyManager; + private Context context; + /** * Constructor */ @@ -76,6 +79,7 @@ public OwnCloudClient(Uri baseUri, HttpConnectionManager connectionMgr, Context if (baseUri == null) { throw new IllegalArgumentException("Parameter 'baseUri' cannot be NULL"); } + this.context = context; this.keyManager = new AdvancedX509KeyManager(context); nextcloudUriDelegate = new NextcloudUriDelegate(baseUri); @@ -449,4 +453,18 @@ public OwnCloudCredentials getCredentials() { public void setFollowRedirects(boolean followRedirects) { this.followRedirects = followRedirects; } + + public Context getContext() { + return context; + } + + public NextcloudClient toNextcloudClient() { + return OwnCloudClientFactory.createNextcloudClient( + getBaseUri(), + getUserId(), + getCredentials().toOkHttpCredentials(), + getContext(), + isFollowRedirects() + ); + } } 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 db110881ef..b3036c9bdd 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 @@ -55,7 +55,7 @@ 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); 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 32270bc7a4..52072ab6f6 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 @@ -8,6 +8,8 @@ import android.content.Context; +import com.nextcloud.common.NextcloudClient; +import com.nextcloud.operations.HeadMethod; import com.owncloud.android.lib.common.OwnCloudAnonymousCredentials; import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.network.RedirectionPath; @@ -16,22 +18,23 @@ import com.owncloud.android.lib.common.utils.Log_OC; import org.apache.commons.httpclient.HttpStatus; -import org.apache.commons.httpclient.methods.HeadMethod; /** * Operation to check the existence or absence of a path in a remote server. * * @author David A. Velasco */ -public class ExistenceCheckRemoteOperation extends RemoteOperation { - - /** Maximum time to wait for a response from the server in MILLISECONDs. */ +public class ExistenceCheckRemoteOperation extends RemoteOperation { + + /** + * 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; + private final String mPath; + private final boolean mSuccessIfAbsent; /** Sequence of redirections followed. Available only after executing the operation */ private RedirectionPath mRedirectionPath = null; @@ -63,15 +66,15 @@ public ExistenceCheckRemoteOperation(String remotePath, Context context, boolean } @Override - protected RemoteOperationResult run(OwnCloudClient client) { + protected RemoteOperationResult run(OwnCloudClient client) { RemoteOperationResult result = null; - HeadMethod head = null; + org.apache.commons.httpclient.methods.HeadMethod head = null; boolean previousFollowRedirects = client.isFollowRedirects(); try { if (client.getCredentials() instanceof OwnCloudAnonymousCredentials) { - head = new HeadMethod(client.getDavUri().toString()); + head = new org.apache.commons.httpclient.methods.HeadMethod(client.getDavUri().toString()); } else { - head = new HeadMethod(client.getFilesDavUri(mPath)); + head = new org.apache.commons.httpclient.methods.HeadMethod(client.getFilesDavUri(mPath)); } client.setFollowRedirects(false); int status = client.executeMethod(head, TIMEOUT, TIMEOUT); @@ -81,19 +84,58 @@ protected RemoteOperationResult run(OwnCloudClient client) { } client.exhaustResponse(head.getResponseBodyAsStream()); boolean success = (status == HttpStatus.SC_OK && !mSuccessIfAbsent) || - (status == HttpStatus.SC_NOT_FOUND && mSuccessIfAbsent); + (status == HttpStatus.SC_NOT_FOUND && mSuccessIfAbsent); result = new RemoteOperationResult( success, status, head.getStatusText(), head.getResponseHeaders() ); + Log_OC.d(TAG, "Existence check for " + client.getFilesDavUri(mPath) + " targeting for " + + (mSuccessIfAbsent ? " absence " : " existence ") + + "finished with HTTP status " + status + (!success ? "(FAIL)" : "")); + + } catch (Exception e) { + result = new RemoteOperationResult(e); + Log_OC.e(TAG, "Existence check for " + client.getFilesDavUri(mPath) + " targeting for " + + (mSuccessIfAbsent ? " absence " : " existence ") + ": " + + result.getLogMessage(), result.getException()); + + } finally { + if (head != null) + head.releaseConnection(); + client.setFollowRedirects(previousFollowRedirects); + } + return result; + } + + @Override + public RemoteOperationResult run(NextcloudClient client) { + RemoteOperationResult result; + com.nextcloud.operations.HeadMethod head = null; + boolean previousFollowRedirects = client.getFollowRedirects(); + try { + head = new HeadMethod(client.getFilesDavUri(mPath), false); + client.setFollowRedirects(false); + int status = client.execute(head); + if (previousFollowRedirects) { + mRedirectionPath = client.followRedirection(head); + status = mRedirectionPath.getLastStatus(); + } + boolean success = (status == HttpStatus.SC_OK && !mSuccessIfAbsent) || + (status == HttpStatus.SC_NOT_FOUND && mSuccessIfAbsent); + result = new RemoteOperationResult<>( + success, + status, + head.getStatusText(), + head.getResponseHeaders() + ); Log_OC.d(TAG, "Existence check for " + client.getFilesDavUri(mPath) + " targeting for " + (mSuccessIfAbsent ? " absence " : " existence ") + "finished with HTTP status " + status + (!success ? "(FAIL)" : "")); } catch (Exception e) { - result = new RemoteOperationResult(e); + result = new RemoteOperationResult<>(e); Log_OC.e(TAG, "Existence check for " + client.getFilesDavUri(mPath) + " targeting for " + (mSuccessIfAbsent ? " absence " : " existence ") + ": " + result.getLogMessage(), result.getException()); 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 ec3300f0ec..79d92543bd 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 0ef9a46e98..3515c0be94 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 b579e65ba9..620a8fd1f9 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 5e5090a666..586b7fde09 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 830a677249..5cbef96551 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 423abcbe32..dbc8283786 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