Merge branch 'master' into publicUpload (fe457d52) · Commits · e / os / nextcloud-android-lib

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

+18 −3

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ package com.owncloud.android.lib.resources.activities.models;

		import com.google.gson.TypeAdapter;
		import com.google.gson.stream.JsonReader;
		import com.google.gson.stream.JsonToken;
		import com.google.gson.stream.JsonWriter;

		import java.io.IOException;
		@@ -51,11 +52,25 @@ public class RichElementTypeAdapter extends TypeAdapter<RichElement> {
		if (count == 0) {
		richElement.setRichSubject(in.nextString());
		} else {
		in.beginObject();
		JsonToken nextType = in.peek();

		switch (nextType) {
		case BEGIN_OBJECT:
		in.beginObject();
		read(richElement, in);

		in.endObject();
		break;

		case BEGIN_ARRAY:
		in.beginArray();
		in.endArray();
		break;

		default:
		// do nothing
		break;
		}

		}
		count++;
		}