From ae8f88f4b8c5a3d97bd2e337257c26e7b9102a96 Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Thu, 19 Jan 2023 13:03:42 +0530 Subject: [PATCH] Use Kotlinx Serialization with segments. --- app/src/main/java/com/github/libretube/api/PipedApi.kt | 3 ++- app/src/main/java/com/github/libretube/api/obj/Segment.kt | 4 ++-- app/src/main/java/com/github/libretube/api/obj/SegmentData.kt | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/github/libretube/api/PipedApi.kt b/app/src/main/java/com/github/libretube/api/PipedApi.kt index 53400a9f5..98e032389 100644 --- a/app/src/main/java/com/github/libretube/api/PipedApi.kt +++ b/app/src/main/java/com/github/libretube/api/PipedApi.kt @@ -15,6 +15,7 @@ import com.github.libretube.api.obj.SegmentData import com.github.libretube.api.obj.StreamItem import com.github.libretube.api.obj.Streams import com.github.libretube.api.obj.Subscribe +import com.github.libretube.api.obj.Subscribed import com.github.libretube.api.obj.Subscription import com.github.libretube.api.obj.Token import retrofit2.http.Body @@ -114,7 +115,7 @@ interface PipedApi { suspend fun isSubscribed( @Query("channelId") channelId: String, @Header("Authorization") token: String - ): com.github.libretube.api.obj.Subscribed + ): Subscribed @GET("subscriptions") suspend fun subscriptions(@Header("Authorization") token: String): List diff --git a/app/src/main/java/com/github/libretube/api/obj/Segment.kt b/app/src/main/java/com/github/libretube/api/obj/Segment.kt index 951a7b472..c1711e417 100644 --- a/app/src/main/java/com/github/libretube/api/obj/Segment.kt +++ b/app/src/main/java/com/github/libretube/api/obj/Segment.kt @@ -1,8 +1,8 @@ package com.github.libretube.api.obj -import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import kotlinx.serialization.Serializable -@JsonIgnoreProperties(ignoreUnknown = true) +@Serializable data class Segment( val UUID: String? = null, val actionType: String? = null, diff --git a/app/src/main/java/com/github/libretube/api/obj/SegmentData.kt b/app/src/main/java/com/github/libretube/api/obj/SegmentData.kt index a383cd801..4f65720af 100644 --- a/app/src/main/java/com/github/libretube/api/obj/SegmentData.kt +++ b/app/src/main/java/com/github/libretube/api/obj/SegmentData.kt @@ -1,8 +1,8 @@ package com.github.libretube.api.obj -import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import kotlinx.serialization.Serializable -@JsonIgnoreProperties(ignoreUnknown = true) +@Serializable data class SegmentData( val hash: String? = null, val segments: List = listOf(),