Skip to content

Fix widget migration issues #581

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
jvsena42 merged 1 commit into from
Jan 8, 2026
Merged

Fix widget migration issues #581

Show file tree
Hide file tree
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
19 changes: 10 additions & 9 deletions app/src/main/java/to/bitkit/data/widgets/PriceService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,12 @@ class PriceService @Inject constructor(
override suspend fun fetchData(): Result<PriceDTO> = runCatching {
val period = widgetsStore.data.first().pricePreferences.period ?: GraphPeriod.ONE_DAY

val widgets = TradingPair.entries.map { pair ->
fetchPairData(pair = pair, period = period)
val widgets = TradingPair.entries.mapNotNull { pair ->
runCatching { fetchPairData(pair = pair, period = period) }
.onFailure { Logger.warn(e = it, msg = "Failed to fetch ${pair.ticker}", context = TAG) }
.getOrNull()
}
if (widgets.isEmpty()) throw PriceError.InvalidResponse("No price data available")
PriceDTO(widgets = widgets, source = sourceLabel)
}.onFailure {
Logger.warn(e = it, msg = "Failed to fetch price data", context = TAG)
Expand All @@ -53,14 +56,12 @@ class PriceService @Inject constructor(
coroutineScope {
GraphPeriod.entries.map { period ->
async {
PriceDTO(
widgets = TradingPair.entries.map { pair ->
fetchPairData(pair = pair, period = period)
},
source = sourceLabel
)
val widgets = TradingPair.entries.mapNotNull { pair ->
runCatching { fetchPairData(pair = pair, period = period) }.getOrNull()
}
PriceDTO(widgets = widgets, source = sourceLabel)
}
}.awaitAll()
}.awaitAll().filter { it.widgets.isNotEmpty() }
}
}.onFailure {
Logger.warn(e = it, msg = "fetchAllPeriods: Failed to fetch price data", context = TAG)
Expand Down
53 changes: 30 additions & 23 deletions app/src/main/java/to/bitkit/services/MigrationService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,9 +551,10 @@ class MigrationService @Inject constructor(
val widgetsJsonString = root["widgets"]?.jsonPrimitive?.content ?: return null

val widgets = json.decodeFromString<RNWidgets>(widgetsJsonString)

val widgetsData = json.parseToJsonElement(widgetsJsonString).jsonObject
val widgetOptions = convertRNWidgetPreferences(widgetsData["widgets"]?.jsonObject ?: widgetsData)
val widgetOptions = convertRNWidgetPreferences(
widgetsData["widgets"]?.jsonObject ?: widgetsData
)

RNWidgetsWithOptions(widgets = widgets, widgetOptions = widgetOptions)
} catch (e: Exception) {
Expand Down Expand Up @@ -884,6 +885,7 @@ class MigrationService @Inject constructor(
"blocks" to WidgetType.BLOCK,
"weather" to WidgetType.WEATHER,
"facts" to WidgetType.FACTS,
"calculator" to WidgetType.CALCULATOR,
)

val savedWidgets = sortOrder.mapNotNull { widgetName ->
Expand Down Expand Up @@ -1502,10 +1504,15 @@ class MigrationService @Inject constructor(
val result = mutableMapOf<String, ByteArray>()
if (widgetsDict == null) return result

fun getBool(key: String, fallbackKey: String? = null, defaultValue: Boolean = false): Boolean {
fun getBool(
source: kotlinx.serialization.json.JsonObject,
key: String,
fallbackKey: String? = null,
defaultValue: Boolean = false,
): Boolean {
val keys = if (fallbackKey != null) listOf(key, fallbackKey) else listOf(key)
for (k in keys) {
widgetsDict[k]?.let { element ->
source[k]?.let { element ->
when {
element is kotlinx.serialization.json.JsonPrimitive && element.isString -> {
val str = element.content.lowercase()
Expand Down Expand Up @@ -1541,7 +1548,7 @@ class MigrationService @Inject constructor(
)
val period = periodMap[rnPeriod] ?: rnPeriod

val showSource = getBool("showSource", defaultValue = false)
val showSource = getBool(prefs, "showSource", defaultValue = false)
val pairsJson = selectedPairs.joinToString(",", "[", "]") { "\"$it\"" }
val priceOptionsJson =
"""{"selectedPairs":$pairsJson,"selectedPeriod":"$period","showSource":$showSource}"""
Expand All @@ -1550,47 +1557,47 @@ class MigrationService @Inject constructor(

val weatherPrefs = widgetsDict["weatherPreferences"]?.jsonObject
?: widgetsDict["weather"]?.jsonObject
weatherPrefs?.let {
weatherPrefs?.let { prefs ->
val weatherOptions = buildJsonObject {
put("showStatus", getBool("showTitle", "showStatus", defaultValue = true))
put("showText", getBool("showDescription", "showText", defaultValue = false))
put("showMedian", getBool("showCurrentFee", "showMedian", defaultValue = false))
put("showNextBlockFee", getBool("showNextBlockFee", defaultValue = false))
put("showStatus", getBool(prefs, "showTitle", "showStatus", defaultValue = true))
put("showText", getBool(prefs, "showDescription", "showText", defaultValue = false))
put("showMedian", getBool(prefs, "showCurrentFee", "showMedian", defaultValue = false))
put("showNextBlockFee", getBool(prefs, "showNextBlockFee", defaultValue = false))
}
result["weather"] = weatherOptions.toString().encodeToByteArray()
}

val newsPrefs = widgetsDict["headlinePreferences"]?.jsonObject
?: widgetsDict["headline"]?.jsonObject
?: widgetsDict["news"]?.jsonObject
newsPrefs?.let {
newsPrefs?.let { prefs ->
val newsOptions = buildJsonObject {
put("showDate", getBool("showDate", "showTime", defaultValue = true))
put("showTitle", getBool("showTitle", defaultValue = true))
put("showSource", getBool("showSource", defaultValue = true))
put("showDate", getBool(prefs, "showDate", "showTime", defaultValue = true))
put("showTitle", getBool(prefs, "showTitle", defaultValue = true))
put("showSource", getBool(prefs, "showSource", defaultValue = true))
}
result["news"] = newsOptions.toString().encodeToByteArray()
}

val blocksPrefs = widgetsDict["blocksPreferences"]?.jsonObject
?: widgetsDict["blocks"]?.jsonObject
blocksPrefs?.let {
blocksPrefs?.let { prefs ->
val blocksOptions = buildJsonObject {
put("height", getBool("height", "showBlock", defaultValue = true))
put("time", getBool("time", "showTime", defaultValue = true))
put("date", getBool("date", "showDate", defaultValue = true))
put("transactionCount", getBool("transactionCount", "showTransactions", defaultValue = false))
put("size", getBool("size", "showSize", defaultValue = false))
put("showSource", getBool("showSource", defaultValue = false))
put("height", getBool(prefs, "height", "showBlock", defaultValue = true))
put("time", getBool(prefs, "time", "showTime", defaultValue = true))
put("date", getBool(prefs, "date", "showDate", defaultValue = true))
put("transactionCount", getBool(prefs, "transactionCount", "showTransactions", defaultValue = false))
put("size", getBool(prefs, "size", "showSize", defaultValue = false))
put("showSource", getBool(prefs, "showSource", defaultValue = false))
}
result["blocks"] = blocksOptions.toString().encodeToByteArray()
}

val factsPrefs = widgetsDict["factsPreferences"]?.jsonObject
?: widgetsDict["facts"]?.jsonObject
factsPrefs?.let {
factsPrefs?.let { prefs ->
val factsOptions = buildJsonObject {
put("showSource", getBool("showSource", defaultValue = false))
put("showSource", getBool(prefs, "showSource", defaultValue = false))
}
result["facts"] = factsOptions.toString().encodeToByteArray()
}
Expand Down
Loading