Skip to content

Keep all JsonProperty for now #541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Luna712 merged 2 commits into from
Jun 18, 2026
Merged

Keep all JsonProperty for now #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07f81c3
Keep all JsonProperty for now
Luna712 Jun 18, 2026
4281a84
Keep all JsonProperty for now
Luna712 Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import androidx.core.content.edit
import androidx.core.os.ConfigurationCompat
import androidx.fragment.app.Fragment
import androidx.preference.PreferenceManager
import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.APIHolder.allProviders
import com.lagradost.cloudstream3.CloudStreamApp
import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
Expand Down Expand Up @@ -135,7 +136,7 @@ fun Pair<String, String>.nameNextToFlagEmoji(): String {
// fallback to [A][A] -> [?] question mak flag
val flag = SubtitleHelper.getFlagFromIso(this.second) ?: "\ud83c\udde6\ud83c\udde6"

return "$flag\u00a0${this.first}" // \u00a0 non-breaking space
return "$flag\u00a0${this.first}" // \u00a0 non-breaking space
}

class SettingsGeneral : BasePreferenceFragmentCompat() {
Expand All @@ -148,10 +149,10 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {

@Serializable
data class CustomSite(
@SerialName("parentJavaClass") val parentJavaClass: String, // javaClass.simpleName
@SerialName("name") val name: String,
@SerialName("url") val url: String,
@SerialName("lang") val lang: String,
@JsonProperty("parentJavaClass") @SerialName("parentJavaClass") val parentJavaClass: String, // javaClass.simpleName
@JsonProperty("name") @SerialName("name") val name: String,
@JsonProperty("url") @SerialName("url") val url: String,
@JsonProperty("lang") @SerialName("lang") val lang: String,
)

companion object {
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.ui.settings.extensions
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
import com.lagradost.cloudstream3.R
import com.lagradost.cloudstream3.amap
Expand All @@ -19,9 +20,9 @@ import kotlinx.serialization.Serializable

@Serializable
data class RepositoryData(
@SerialName("iconUrl") val iconUrl: String?,
@SerialName("name") val name: String,
@SerialName("url") val url: String,
@JsonProperty("iconUrl") @SerialName("iconUrl") val iconUrl: String?,
@JsonProperty("name") @SerialName("name") val name: String,
@JsonProperty("url") @SerialName("url") val url: String,
) {
constructor(name: String, url: String): this(null, name, url)
}
Expand Down Expand Up @@ -92,4 +93,4 @@ class ExtensionsViewModel : ViewModel() {
val urls = repos()
_repositories.postValue(urls)
}
}
}