avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-06-21 06:39:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Conflict/breakage after merging #159

Browse Source
This commit is contained in:
machiav3lli
2022-01-05 00:43:06 +01:00
parent 8dc4dcce0f
commit 3e149cf946
6 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/com/looker/droidify/entity/Product.kt
View File

@ -3,6 +3,7 @@ package com.looker.droidify.entity
import com.fasterxml.jackson.core.JsonGenerator
import com.fasterxml.jackson.core.JsonParser
import com.fasterxml.jackson.core.JsonToken
import com.looker.droidify.database.Installed
import com.looker.droidify.utility.extension.json.*
import com.looker.droidify.utility.extension.text.nullIfEmpty
@ -87,9 +88,9 @@ data class Product(
)
}
fun canUpdate(installedItem: InstalledItem?): Boolean {
return installedItem != null && compatible && versionCode > installedItem.versionCode &&
installedItem.signature in signatures
fun canUpdate(installed: Installed?): Boolean {
return installed != null && compatible && versionCode > installed.version_code &&
installed.signature in signatures
}
fun serialize(generator: JsonGenerator) {
@ -162,12 +163,12 @@ data class Product(
companion object {
fun <T> findSuggested(
products: List<T>,
installedItem: InstalledItem?,
installed: Installed?,
extract: (T) -> Product,
): T? {
return products.maxWithOrNull(compareBy({
extract(it).compatible &&
(installedItem == null || installedItem.signature in extract(it).signatures)
(installed == null || installed.signature in extract(it).signatures)
}, { extract(it).versionCode }))
}