Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 717d7ab3 authored by tobiasKaminsky's avatar tobiasKaminsky
Browse files

wip

parent f97ed965
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public class GetActivitiesRemoteOperation extends RemoteOperation {

        Gson gson = new GsonBuilder()
                .registerTypeAdapter(RichElement.class, new RichElementTypeAdapter())
                .registerTypeAdapter(PreviewObject.class, new PreviewListAdapter())
                .registerTypeAdapter(PreviewObject.class, new PreviewObjectAdapter())
                .create();
        Type listType = new TypeToken<List<Activity>>(){}.getType();

+6 −3
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.google.gson.annotations.SerializedName;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * Activity Data Model
@@ -48,7 +49,6 @@ public class Activity {
    @SerializedName("affecteduser")
    public String affectedUser;
    public String subject;

    public String message;
    public String icon;
    public String link;
@@ -58,9 +58,8 @@ public class Activity {
    public String objectId;
    @SerializedName("object_name")
    public String objectName;

    public List<PreviewObject> previews;

    public Map<Integer, String> objects;
    @SerializedName("subject_rich")
    public RichElement richSubjectElement;

@@ -192,4 +191,8 @@ public class Activity {
    public void setPreviews(ArrayList<PreviewObject> previews) {
        this.previews = previews;
    }

    public Map<Integer, String> getObjects() {
        return objects;
    }
}
+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import java.io.IOException;
 * PreviewList Parser
 */

public class PreviewListAdapter extends TypeAdapter<PreviewObject> {
public class PreviewObjectAdapter extends TypeAdapter<PreviewObject> {

    @Override
    public void write(JsonWriter out, PreviewObject value) {