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

15
src/main/kotlin/com/looker/droidify/service/SyncService.kt
View File

@ -435,8 +435,8 @@ class SyncService : ConnectionService<SyncService.Binder>() {
// run startUpdate on every item
productItems.map { productItem ->
Pair(
Database.InstalledAdapter.get(productItem.packageName, null),
Database.RepositoryAdapter.get(productItem.repositoryId)
db.installedDao.getObject(productItem.packageName),
db.repositoryDao.get(productItem.repositoryId)
)
}
.filter { pair -> pair.first != null && pair.second != null }
@ -446,16 +446,15 @@ class SyncService : ConnectionService<SyncService.Binder>() {
val installedItem = installedRepository.first!!
val repository = installedRepository.second!!
val productRepository = Database.ProductAdapter.get(
installedItem.packageName,
null
val productRepository = db.productDao.get(
installedItem.package_name
)
.filter { product -> product.repositoryId == repository.id }
.map { product -> Pair(product, repository) }
.filter { product -> product?.repository_id == repository.id }
.map { product -> Pair(product?.data!!, repository.data!!) }
scope.launch {
Utils.startUpdate(
installedItem.packageName,
installedItem.package_name,
installedRepository.first,
productRepository,
downloadConnection