From 95c0b24d3cc9c64496a1cba911a2cdcfa87c4b1d Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Tue, 16 Oct 2018 18:44:44 +0200 Subject: [PATCH] Include streamUrlIndex in ModelJsonAdapter This is needed to save / transmit the user selected quality. --- src/main/java/ctbrec/io/ModelJsonAdapter.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/ctbrec/io/ModelJsonAdapter.java b/src/main/java/ctbrec/io/ModelJsonAdapter.java index 6254461e..6ac86591 100644 --- a/src/main/java/ctbrec/io/ModelJsonAdapter.java +++ b/src/main/java/ctbrec/io/ModelJsonAdapter.java @@ -6,12 +6,11 @@ import java.util.Optional; import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.JsonReader; import com.squareup.moshi.JsonReader.Token; +import com.squareup.moshi.JsonWriter; import ctbrec.Model; import ctbrec.sites.chaturbate.ChaturbateModel; -import com.squareup.moshi.JsonWriter; - public class ModelJsonAdapter extends JsonAdapter { @Override @@ -21,6 +20,7 @@ public class ModelJsonAdapter extends JsonAdapter { String description = null; String url = null; String type = null; + int streamUrlIndex = -1; while(reader.hasNext()) { Token token = reader.peek(); if(token == Token.NAME) { @@ -33,6 +33,8 @@ public class ModelJsonAdapter extends JsonAdapter { url = reader.nextString(); } else if(key.equals("type")) { type = reader.nextString(); + } else if(key.equals("streamUrlIndex")) { + streamUrlIndex = reader.nextInt(); } } else { reader.skipValue(); @@ -46,6 +48,7 @@ public class ModelJsonAdapter extends JsonAdapter { model.setName(name); model.setDescription(description); model.setUrl(url); + model.setStreamUrlIndex(streamUrlIndex); return model; } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { throw new IOException("Couldn't instantiate mode class [" + type + "]", e); @@ -59,6 +62,7 @@ public class ModelJsonAdapter extends JsonAdapter { writeValueIfSet(writer, "name", model.getName()); writeValueIfSet(writer, "description", model.getDescription()); writeValueIfSet(writer, "url", model.getUrl()); + writer.name("streamUrlIndex").value(model.getStreamUrlIndex()); writer.endObject(); }