refactors changelog and version handling, fixes crash on startup due to version mismatch.

This commit is contained in:
octoshrimpy
2024-11-02 15:11:20 -04:00
parent b2c5aab7d5
commit 2d902150b1
8 changed files with 74 additions and 44 deletions
@@ -19,6 +19,7 @@
package dev.octoshrimpy.quik.manager
import android.content.Context
import android.util.Log
import dev.octoshrimpy.quik.common.util.extensions.versionCode
import dev.octoshrimpy.quik.util.Preferences
import com.squareup.moshi.Json
@@ -42,25 +43,33 @@ class ChangelogManagerImpl @Inject constructor(
private val prefs: Preferences
) : ChangelogManager {
override fun didUpdate(): Boolean = prefs.changelogVersion.get() != context.versionCode
override fun didUpdate(): Boolean = (prefs.changelogVersion.get() ?: 0) != context.versionCode
override suspend fun getChangelog(): ChangelogManager.CumulativeChangelog {
val listType = Types.newParameterizedType(List::class.java, Changeset::class.java)
val adapter = moshi.adapter<List<Changeset>>(listType)
return withContext(Dispatchers.IO) {
val changelogs = context.assets.open("changelog.json").bufferedReader().use { it.readText() }
.let(adapter::fromJson)
.orEmpty()
.sortedBy { changelog -> changelog.versionCode }
.filter { changelog ->
changelog.versionCode in prefs.changelogVersion.get().inc()..context.versionCode
}
try {
val changelogs = context.assets.open("changelog.json").bufferedReader().use { it.readText() }
.let(adapter::fromJson)
.orEmpty()
.sortedBy { changelog -> changelog.versionCode }
.filter { changelog ->
changelog.versionCode in (prefs.changelogVersion.get() ?: 0).inc()..context.versionCode
}
ChangelogManager.CumulativeChangelog(
added = changelogs.fold(listOf()) { acc, changelog -> acc + changelog.added.orEmpty()},
improved = changelogs.fold(listOf()) { acc, changelog -> acc + changelog.improved.orEmpty()},
fixed = changelogs.fold(listOf()) { acc, changelog -> acc + changelog.fixed.orEmpty()})
ChangelogManager.CumulativeChangelog(
added = changelogs.fold(listOf()) { acc, changelog -> acc + changelog.added.orEmpty()},
improved = changelogs.fold(listOf()) { acc, changelog -> acc + changelog.improved.orEmpty()},
removed = changelogs.fold(listOf()) { acc, changelog -> acc + changelog.removed.orEmpty()},
fixed = changelogs.fold(listOf()) { acc, changelog -> acc + changelog.fixed.orEmpty()}
)
} catch (e: Exception) {
Log.e("ChangelogManager", "Error parsing changelog JSON", e)
ChangelogManager.CumulativeChangelog(emptyList(), emptyList(), emptyList(), emptyList())
}
}
}
@@ -68,10 +77,11 @@ class ChangelogManagerImpl @Inject constructor(
prefs.changelogVersion.set(context.versionCode)
}
@JsonClass(generateAdapter = true)
@JsonClass(generateAdapter = false)
data class Changeset(
@Json(name = "added") val added: List<String>?,
@Json(name = "improved") val improved: List<String>?,
@Json(name = "removed") val removed: List<String>?,
@Json(name = "fixed") val fixed: List<String>?,
@Json(name = "versionName") val versionName: String,
@Json(name = "versionCode") val versionCode: Int