Renaming RichElement (dce88e1b) · Commits · e / os / Nextcloud Android Library

src/com/owncloud/android/lib/resources/activities/GetRemoteActivitiesOperation.java

+7 −8

Original line number	Diff line number	Diff line
		@@ -38,9 +38,8 @@ 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.activities.models.Activity;
		import com.owncloud.android.lib.resources.activities.models.RichSubject;
		import com.owncloud.android.lib.resources.activities.models.RichSubjectTypeAdapter;
		import com.owncloud.android.lib.resources.status.OwnCloudVersion;
		import com.owncloud.android.lib.resources.activities.models.RichElement;
		import com.owncloud.android.lib.resources.activities.models.RichElementTypeAdapter;

		import org.apache.commons.httpclient.HttpStatus;
		import org.apache.commons.httpclient.methods.GetMethod;
		@@ -75,11 +74,11 @@ public class GetRemoteActivitiesOperation extends RemoteOperation{
		GetMethod get = null;
		ArrayList<Object> activities;
		String url;
		if (client.getOwnCloudVersion().compareTo(OwnCloudVersion.nextcloud_12) >= 0) {
		// if (client.getOwnCloudVersion().compareTo(OwnCloudVersion.nextcloud_12) >= 0) {
		url = client.getBaseUri() + OCS_ROUTE_V12_AND_UP;
		} else {
		url = client.getBaseUri() + OCS_ROUTE_PRE_V12;
		}
		// } else {
		// url = client.getBaseUri() + OCS_ROUTE_PRE_V12;
		// }
		Log_OC.d(TAG, "URL: " + url);

		try {
		@@ -122,7 +121,7 @@ public class GetRemoteActivitiesOperation extends RemoteOperation{
		JsonArray jsonDataArray = jo.getAsJsonObject(NODE_OCS).getAsJsonArray(NODE_DATA);

		Gson gson = new GsonBuilder()
		.registerTypeAdapter(RichSubject.class,new RichSubjectTypeAdapter())//Add TypeAdapter to parse RichSubject
		.registerTypeAdapter(RichElement.class,new RichElementTypeAdapter())//Add TypeAdapter to parse RichElement
		.create();
		Type listType = new TypeToken<List<Activity>>(){}.getType();

src/com/owncloud/android/lib/resources/activities/models/Activity.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ public class Activity {
		public String objectName;

		@SerializedName("subject_rich")
		public RichSubject richSubject;
		public RichElement richElement;

		public Date getDate() {
		return date;
		@@ -173,11 +173,11 @@ public class Activity {
		this.objectName = objectName;
		}

		public RichSubject getRichSubject() {
		return richSubject;
		public RichElement getRichElement() {
		return richElement;
		}

		public void setRichSubject(RichSubject richSubject) {
		this.richSubject = richSubject;
		public void setRichElement(RichElement richElement) {
		this.richElement = richElement;
		}
		}

src/com/owncloud/android/lib/resources/activities/models/RichSubject.java→src/com/owncloud/android/lib/resources/activities/models/RichElement.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -28,10 +28,10 @@ package com.owncloud.android.lib.resources.activities.models;
		import java.util.ArrayList;

		/**
		* RichSubject Data Model
		* RichElement Data Model
		*/

		public class RichSubject {
		public class RichElement {

		public String richSubject;
		ArrayList<RichObject> richObjectList = new ArrayList<>();
		@@ -54,5 +54,4 @@ public class RichSubject {
		}



		}

src/com/owncloud/android/lib/resources/activities/models/RichSubjectTypeAdapter.java→src/com/owncloud/android/lib/resources/activities/models/RichElementTypeAdapter.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -32,28 +32,28 @@ import com.google.gson.stream.JsonWriter;
		import java.io.IOException;

		/**
		* RichSubject Parser
		* RichElement Parser
		*/

		public class RichSubjectTypeAdapter extends TypeAdapter<RichSubject> {
		public class RichElementTypeAdapter extends TypeAdapter<RichElement> {

		@Override
		public void write(JsonWriter out, RichSubject value) throws IOException {
		public void write(JsonWriter out, RichElement value) throws IOException {

		}

		@Override
		public RichSubject read(JsonReader in) throws IOException {
		RichSubject richSubject = new RichSubject();
		public RichElement read(JsonReader in) throws IOException {
		RichElement richElement = new RichElement();
		in.beginArray();
		int count = 0;
		while (in.hasNext()) {
		if (count == 0) {
		richSubject.setRichSubject(in.nextString());
		richElement.setRichSubject(in.nextString());
		} else {
		in.beginObject();

		read(richSubject, in);
		read(richElement, in);

		in.endObject();
		}
		@@ -63,14 +63,14 @@ public class RichSubjectTypeAdapter extends TypeAdapter<RichSubject> {

		in.endArray();

		return richSubject;
		return richElement;
		}

		private void read(RichSubject richSubject, JsonReader in) throws IOException {
		private void read(RichElement richElement, JsonReader in) throws IOException {
		while (in.hasNext()) {
		String name = in.nextName();
		if (name != null && !name.isEmpty()) {
		richSubject.getRichObjectList().add(readObject(name,in));
		richElement.getRichObjectList().add(readObject(name,in));
		}
		}
		}