Skip to content

InAppUpdater: migrate to kotlinx serialization #2877

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

Open
Luna712 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

InAppUpdater: migrate to kotlinx serialization #2877

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 26 additions & 20 deletions app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import androidx.core.content.ContextCompat
import androidx.core.content.FileProvider
import androidx.core.content.edit
import androidx.preference.PreferenceManager
import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.BuildConfig
import com.lagradost.cloudstream3.CommonActivity.showToast
import com.lagradost.cloudstream3.MainActivity.Companion.deleteFileOnExit
Expand All @@ -27,6 +26,8 @@ import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
import com.lagradost.cloudstream3.utils.GitInfo.currentCommitHash
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import okio.BufferedSink
import okio.buffer
import okio.sink
Expand All @@ -42,38 +43,43 @@ object InAppUpdater {
private const val PRERELEASE_PACKAGE_NAME = "com.lagradost.cloudstream3.prerelease"
private const val LOG_TAG = "InAppUpdater"

@Serializable
private data class GithubAsset(
@JsonProperty("name") val name: String,
@JsonProperty("size") val size: Int, // Size in bytes
@JsonProperty("browser_download_url") val browserDownloadUrl: String,
@JsonProperty("content_type") val contentType: String, // application/vnd.android.package-archive
@SerialName("name") val name: String,
@SerialName("size") val size: Int, // Size in bytes
@SerialName("browser_download_url") val browserDownloadUrl: String,
@SerialName("content_type") val contentType: String, // application/vnd.android.package-archive
)

@Serializable
private data class GithubRelease(
@JsonProperty("tag_name") val tagName: String, // Version code
@JsonProperty("body") val body: String, // Description
@JsonProperty("assets") val assets: List<GithubAsset>,
@JsonProperty("target_commitish") val targetCommitish: String, // Branch
@JsonProperty("prerelease") val prerelease: Boolean,
@JsonProperty("node_id") val nodeId: String,
@SerialName("tag_name") val tagName: String, // Version code
@SerialName("body") val body: String, // Description
@SerialName("assets") val assets: List<GithubAsset>,
@SerialName("target_commitish") val targetCommitish: String, // Branch
@SerialName("prerelease") val prerelease: Boolean,
@SerialName("node_id") val nodeId: String,
)

@Serializable
private data class GithubObject(
@JsonProperty("sha") val sha: String, // SHA-256 hash
@JsonProperty("type") val type: String,
@JsonProperty("url") val url: String,
@SerialName("sha") val sha: String, // SHA-256 hash
@SerialName("type") val type: String,
@SerialName("url") val url: String,
)

@Serializable
private data class GithubTag(
@JsonProperty("object") val githubObject: GithubObject,
@SerialName("object") val githubObject: GithubObject,
)

@Serializable
private data class Update(
@JsonProperty("shouldUpdate") val shouldUpdate: Boolean,
@JsonProperty("updateURL") val updateURL: String?,
@JsonProperty("updateVersion") val updateVersion: String?,
@JsonProperty("changelog") val changelog: String?,
@JsonProperty("updateNodeId") val updateNodeId: String?,
@SerialName("shouldUpdate") val shouldUpdate: Boolean,
@SerialName("updateURL") val updateURL: String?,
@SerialName("updateVersion") val updateVersion: String?,
@SerialName("changelog") val changelog: String?,
@SerialName("updateNodeId") val updateNodeId: String?,
)

private suspend fun Activity.getAppUpdate(installPrerelease: Boolean): Update {
Expand Down