Merge pull request #309 from nextcloud/renameRemote (7e763478) · Commits · e / os / Nextcloud Android Library

src/androidTest/java/com/owncloud/android/lib/resources/users/SetRemoteUserInfoOperationTest.java→src/androidTest/java/com/owncloud/android/lib/resources/users/SetUserInfoRemoteOperationTest.java

+25 −25

Original line number	Diff line number	Diff line
		@@ -36,120 +36,120 @@ import org.junit.Test;
		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertTrue;

		public class SetRemoteUserInfoOperationTest extends AbstractIT {
		public class SetUserInfoRemoteOperationTest extends AbstractIT {
		@Test
		public void testSetEmail() {
		RemoteOperationResult userInfo = new GetRemoteUserInfoOperation().execute(client);
		RemoteOperationResult userInfo = new GetUserInfoRemoteOperation().execute(client);
		assertTrue(userInfo.isSuccess());
		String oldValue = ((UserInfo) userInfo.getData().get(0)).email;

		// set
		assertTrue(new SetRemoteUserInfoOperation(SetRemoteUserInfoOperation.Field.EMAIL, "new@mail.com")
		assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.EMAIL, "new@mail.com")
		.execute(client).isSuccess());

		userInfo = new GetRemoteUserInfoOperation().execute(client);
		userInfo = new GetUserInfoRemoteOperation().execute(client);
		assertTrue(userInfo.isSuccess());
		assertEquals("new@mail.com", ((UserInfo) userInfo.getData().get(0)).email);

		// reset
		assertTrue(new SetRemoteUserInfoOperation(SetRemoteUserInfoOperation.Field.EMAIL, oldValue)
		assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.EMAIL, oldValue)
		.execute(client).isSuccess());
		}

		@Test
		public void testSetDisplayName() {
		RemoteOperationResult userInfo = new GetRemoteUserInfoOperation().execute(client);
		RemoteOperationResult userInfo = new GetUserInfoRemoteOperation().execute(client);
		assertTrue(userInfo.isSuccess());

		String oldUserId = client.getUserId();
		assertEquals(client.getUserId(), ((UserInfo) userInfo.getData().get(0)).displayName);

		// set display name
		assertTrue(new SetRemoteUserInfoOperation(SetRemoteUserInfoOperation.Field.DISPLAYNAME, "newName")
		assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.DISPLAYNAME, "newName")
		.execute(client).isSuccess());

		userInfo = new GetRemoteUserInfoOperation().execute(client);
		userInfo = new GetUserInfoRemoteOperation().execute(client);
		assertTrue(userInfo.isSuccess());
		assertEquals("newName", ((UserInfo) userInfo.getData().get(0)).displayName);

		// reset
		assertTrue(new SetRemoteUserInfoOperation(SetRemoteUserInfoOperation.Field.DISPLAYNAME, oldUserId)
		assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.DISPLAYNAME, oldUserId)
		.execute(client).isSuccess());
		}

		@Test
		public void testSetPhone() {
		RemoteOperationResult userInfo = new GetRemoteUserInfoOperation().execute(client);
		RemoteOperationResult userInfo = new GetUserInfoRemoteOperation().execute(client);
		assertTrue(userInfo.isSuccess());
		String oldValue = ((UserInfo) userInfo.getData().get(0)).phone;

		// set
		assertTrue(new SetRemoteUserInfoOperation(SetRemoteUserInfoOperation.Field.PHONE, "555-12345")
		assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.PHONE, "555-12345")
		.execute(client).isSuccess());

		userInfo = new GetRemoteUserInfoOperation().execute(client);
		userInfo = new GetUserInfoRemoteOperation().execute(client);
		assertTrue(userInfo.isSuccess());
		assertEquals("555-12345", ((UserInfo) userInfo.getData().get(0)).phone);

		// reset
		assertTrue(new SetRemoteUserInfoOperation(SetRemoteUserInfoOperation.Field.PHONE, oldValue)
		assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.PHONE, oldValue)
		.execute(client).isSuccess());
		}

		@Test
		public void testSetAddress() {
		RemoteOperationResult userInfo = new GetRemoteUserInfoOperation().execute(client);
		RemoteOperationResult userInfo = new GetUserInfoRemoteOperation().execute(client);
		assertTrue(userInfo.isSuccess());
		String oldValue = ((UserInfo) userInfo.getData().get(0)).address;

		// set
		assertTrue(new SetRemoteUserInfoOperation(SetRemoteUserInfoOperation.Field.ADDRESS, "NoName Street 123")
		assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.ADDRESS, "NoName Street 123")
		.execute(client).isSuccess());

		userInfo = new GetRemoteUserInfoOperation().execute(client);
		userInfo = new GetUserInfoRemoteOperation().execute(client);
		assertTrue(userInfo.isSuccess());
		assertEquals("NoName Street 123", ((UserInfo) userInfo.getData().get(0)).address);

		// reset
		assertTrue(new SetRemoteUserInfoOperation(SetRemoteUserInfoOperation.Field.ADDRESS, oldValue)
		assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.ADDRESS, oldValue)
		.execute(client).isSuccess());
		}

		@Test
		public void testSetWebsite() {
		RemoteOperationResult userInfo = new GetRemoteUserInfoOperation().execute(client);
		RemoteOperationResult userInfo = new GetUserInfoRemoteOperation().execute(client);
		assertTrue(userInfo.isSuccess());
		String oldValue = ((UserInfo) userInfo.getData().get(0)).website;

		// set
		assertTrue(new SetRemoteUserInfoOperation(SetRemoteUserInfoOperation.Field.WEBSITE, "https://nextcloud.com")
		assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.WEBSITE, "https://nextcloud.com")
		.execute(client).isSuccess());

		userInfo = new GetRemoteUserInfoOperation().execute(client);
		userInfo = new GetUserInfoRemoteOperation().execute(client);
		assertTrue(userInfo.isSuccess());
		assertEquals("https://nextcloud.com", ((UserInfo) userInfo.getData().get(0)).website);

		// reset
		assertTrue(new SetRemoteUserInfoOperation(SetRemoteUserInfoOperation.Field.WEBSITE, oldValue)
		assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.WEBSITE, oldValue)
		.execute(client).isSuccess());
		}

		@Test
		public void testSetTwitter() {
		RemoteOperationResult userInfo = new GetRemoteUserInfoOperation().execute(client);
		RemoteOperationResult userInfo = new GetUserInfoRemoteOperation().execute(client);
		assertTrue(userInfo.isSuccess());
		String oldValue = ((UserInfo) userInfo.getData().get(0)).twitter;

		// set
		assertTrue(new SetRemoteUserInfoOperation(SetRemoteUserInfoOperation.Field.TWITTER, "@Nextclouders")
		assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.TWITTER, "@Nextclouders")
		.execute(client).isSuccess());

		userInfo = new GetRemoteUserInfoOperation().execute(client);
		userInfo = new GetUserInfoRemoteOperation().execute(client);
		assertTrue(userInfo.isSuccess());
		assertEquals("@Nextclouders", ((UserInfo) userInfo.getData().get(0)).twitter);

		// reset
		assertTrue(new SetRemoteUserInfoOperation(SetRemoteUserInfoOperation.Field.TWITTER, oldValue)
		assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.TWITTER, oldValue)
		.execute(client).isSuccess());
		}
		}

src/main/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperation.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ 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 com.owncloud.android.lib.resources.status.GetRemoteCapabilitiesOperation;
		import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation;
		import com.owncloud.android.lib.resources.status.OCCapability;

		import org.apache.commons.httpclient.HttpStatus;
		@@ -76,7 +76,7 @@ public class ExternalLinksOperation extends RemoteOperation {

		try {
		// check capabilities
		RemoteOperation getCapabilities = new GetRemoteCapabilitiesOperation();
		RemoteOperation getCapabilities = new GetCapabilitiesRemoteOperation();
		RemoteOperationResult capabilitiesResult = getCapabilities.execute(client);
		OCCapability capability = (OCCapability) capabilitiesResult.getData().get(0);

src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java→src/main/java/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -37,9 +37,9 @@ import org.apache.commons.httpclient.methods.PostMethod;
		/**
		* Creates a new share. This allows sharing with a user or group or as a link.
		*/
		public class CreateRemoteShareOperation extends RemoteOperation {
		public class CreateShareRemoteOperation extends RemoteOperation {

		private static final String TAG = CreateRemoteShareOperation.class.getSimpleName();
		private static final String TAG = CreateShareRemoteOperation.class.getSimpleName();

		private static final String PARAM_PATH = "path";
		private static final String PARAM_SHARE_TYPE = "shareType";
		@@ -76,7 +76,7 @@ public class CreateRemoteShareOperation extends RemoteOperation {
		* To obtain combinations, add the desired values together.
		* For instance, for Re-Share, delete, read, update, add 16+8+2+1 = 27.
		*/
		public CreateRemoteShareOperation(
		public CreateShareRemoteOperation(
		String remoteFilePath,
		ShareType shareType,
		String shareWith,
		@@ -146,7 +146,7 @@ public class CreateRemoteShareOperation extends RemoteOperation {
		if (result.isSuccess() && mGetShareDetails) {
		// retrieve more info - POST only returns the index of the new share
		OCShare emptyShare = (OCShare) result.getData().get(0);
		GetRemoteShareOperation getInfo = new GetRemoteShareOperation(
		GetShareRemoteOperation getInfo = new GetShareRemoteOperation(
		emptyShare.getRemoteId()
		);
		result = getInfo.execute(client);

src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java→src/main/java/com/owncloud/android/lib/resources/shares/GetShareRemoteOperation.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -37,14 +37,14 @@ import org.apache.commons.httpclient.methods.GetMethod;
		* Get the data about a Share resource, known its remote ID.
		*/

		public class GetRemoteShareOperation extends RemoteOperation {
		public class GetShareRemoteOperation extends RemoteOperation {

		private static final String TAG = GetRemoteShareOperation.class.getSimpleName();
		private static final String TAG = GetShareRemoteOperation.class.getSimpleName();

		private long mRemoteId;


		public GetRemoteShareOperation(long remoteId) {
		public GetShareRemoteOperation(long remoteId) {
		mRemoteId = remoteId;
		}

src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java→src/main/java/com/owncloud/android/lib/resources/shares/GetShareesRemoteOperation.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -62,9 +62,9 @@ import java.util.ArrayList;
		* Status codes:
		* 100 - successful
		*/
		public class GetRemoteShareesOperation extends RemoteOperation{
		public class GetShareesRemoteOperation extends RemoteOperation {

		private static final String TAG = GetRemoteShareesOperation.class.getSimpleName();
		private static final String TAG = GetShareesRemoteOperation.class.getSimpleName();

		// OCS Routes
		private static final String OCS_ROUTE = "ocs/v2.php/apps/files_sharing/api/v1/sharees"; // from OC 8.2
		@@ -106,7 +106,7 @@ public class GetRemoteShareesOperation extends RemoteOperation{
		* @param page page index in the list of results; beginning in 1
		* @param perPage maximum number of results in a single page
		*/
		public GetRemoteShareesOperation(String searchString, int page, int perPage) {
		public GetShareesRemoteOperation(String searchString, int page, int perPage) {
		mSearchString = searchString;
		mPage = page;
		mPerPage = perPage;