diff --git a/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt b/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt index 61f1c6cc5..571d23572 100644 --- a/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt +++ b/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt @@ -4,6 +4,7 @@ import android.content.Context import android.util.Log import com.github.libretube.R import com.github.libretube.api.obj.StreamItem +import com.github.libretube.api.obj.Subscribe import com.github.libretube.api.obj.Subscription import com.github.libretube.constants.PreferenceKeys import com.github.libretube.db.DatabaseHolder.Companion.Database @@ -25,7 +26,7 @@ object SubscriptionHelper { try { RetrofitInstance.authApi.subscribe( PreferenceHelper.getToken(), - com.github.libretube.api.obj.Subscribe(channelId) + Subscribe(channelId) ) } catch (e: Exception) { Log.e(TAG(), e.toString()) @@ -46,7 +47,7 @@ object SubscriptionHelper { try { RetrofitInstance.authApi.unsubscribe( PreferenceHelper.getToken(), - com.github.libretube.api.obj.Subscribe(channelId) + Subscribe(channelId) ) } catch (e: Exception) { Log.e(TAG(), e.toString()) diff --git a/app/src/main/java/com/github/libretube/api/obj/Subscribe.kt b/app/src/main/java/com/github/libretube/api/obj/Subscribe.kt index f474e129b..d268df2ca 100644 --- a/app/src/main/java/com/github/libretube/api/obj/Subscribe.kt +++ b/app/src/main/java/com/github/libretube/api/obj/Subscribe.kt @@ -1,8 +1,6 @@ package com.github.libretube.api.obj -import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import kotlinx.serialization.Serializable -@JsonIgnoreProperties(ignoreUnknown = true) -data class Subscribe( - var channelId: String? = null -) +@Serializable +data class Subscribe(val channelId: String) diff --git a/app/src/main/java/com/github/libretube/api/obj/Subscribed.kt b/app/src/main/java/com/github/libretube/api/obj/Subscribed.kt index f20324e50..94986ec23 100644 --- a/app/src/main/java/com/github/libretube/api/obj/Subscribed.kt +++ b/app/src/main/java/com/github/libretube/api/obj/Subscribed.kt @@ -1,8 +1,6 @@ package com.github.libretube.api.obj -import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import kotlinx.serialization.Serializable -@JsonIgnoreProperties(ignoreUnknown = true) -data class Subscribed( - var subscribed: Boolean? = null -) +@Serializable +data class Subscribed(val subscribed: Boolean? = null) diff --git a/app/src/main/java/com/github/libretube/api/obj/Subscription.kt b/app/src/main/java/com/github/libretube/api/obj/Subscription.kt index 5ddcf0861..b6dbf323b 100644 --- a/app/src/main/java/com/github/libretube/api/obj/Subscription.kt +++ b/app/src/main/java/com/github/libretube/api/obj/Subscription.kt @@ -1,11 +1,11 @@ package com.github.libretube.api.obj -import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import kotlinx.serialization.Serializable -@JsonIgnoreProperties(ignoreUnknown = true) +@Serializable data class Subscription( - var url: String? = null, - var name: String? = null, - var avatar: String? = null, - var verified: Boolean? = null + val url: String, + val name: String, + val avatar: String, + val verified: Boolean )