avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-06-16 04:19: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

8
src/main/kotlin/com/looker/droidify/utility/Utils.kt
View File

@ -14,6 +14,7 @@ import com.fasterxml.jackson.core.JsonGenerator
import com.fasterxml.jackson.core.JsonParser
import com.looker.droidify.*
import com.looker.droidify.content.Preferences
import com.looker.droidify.database.Installed
import com.looker.droidify.entity.InstalledItem
import com.looker.droidify.entity.Product
import com.looker.droidify.entity.ProductItem
@ -31,7 +32,6 @@ import com.looker.droidify.utility.extension.resources.getDrawableCompat
import com.looker.droidify.utility.extension.text.hex
import com.topjohnwu.superuser.Shell
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.collect
import java.io.ByteArrayOutputStream
import java.security.MessageDigest
import java.security.cert.Certificate
@ -99,13 +99,13 @@ object Utils {
suspend fun startUpdate(
packageName: String,
installedItem: InstalledItem?,
installed: Installed?,
products: List<Pair<Product, Repository>>,
downloadConnection: Connection<DownloadService.Binder, DownloadService>,
) {
val productRepository = Product.findSuggested(products, installedItem) { it.first }
val productRepository = Product.findSuggested(products, installed) { it.first }
val compatibleReleases = productRepository?.first?.selectedReleases.orEmpty()
.filter { installedItem == null || installedItem.signature == it.signature }
.filter { installed == null || installed.signature == it.signature }
val releaseFlow = MutableStateFlow(compatibleReleases.firstOrNull())
if (compatibleReleases.size > 1) {
releaseFlow.emit(