diff --git a/src/main/kotlin/com/looker/droidify/Common.kt b/src/main/kotlin/com/looker/droidify/Common.kt index c1fa4cd6..983ebc96 100644 --- a/src/main/kotlin/com/looker/droidify/Common.kt +++ b/src/main/kotlin/com/looker/droidify/Common.kt @@ -23,6 +23,7 @@ const val ROW_COMPATIBLE = "compatible" const val ROW_ICON = "icon" const val ROW_METADATA_ICON = "metadataIcon" const val ROW_RELEASES = "releases" +const val ROW_CATEGORIES = "categories" const val ROW_VERSION = "version" const val ROW_SIGNATURE = "signature" const val ROW_ID = "_id" diff --git a/src/main/kotlin/com/looker/droidify/database/DAOs.kt b/src/main/kotlin/com/looker/droidify/database/DAOs.kt index 2ce62f81..10bea6e0 100644 --- a/src/main/kotlin/com/looker/droidify/database/DAOs.kt +++ b/src/main/kotlin/com/looker/droidify/database/DAOs.kt @@ -128,7 +128,7 @@ interface ProductDao : BaseDao { product.${ROW_COMPATIBLE} != 0 AND product.${ROW_VERSION_CODE} > COALESCE(installed.${ROW_VERSION_CODE}, 0xffffffff) AND $signatureMatches) AS ${ROW_CAN_UPDATE}, product.${ROW_COMPATIBLE}, - product.${ROW_ICON}, product.${ROW_METADATA_ICON}, product.${ROW_RELEASES},""" + product.${ROW_ICON}, product.${ROW_METADATA_ICON}, product.${ROW_RELEASES}, product.${ROW_CATEGORIES},""" // Calculate the matching score with the search query if (searchQuery.isNotEmpty()) { @@ -294,6 +294,7 @@ interface ProductTempDao : BaseDao { icon = it.icon metadataIcon = it.metadataIcon releases = it.releases + categories = it.categories } }) it.categories.forEach { category -> diff --git a/src/main/kotlin/com/looker/droidify/database/DatabaseX.kt b/src/main/kotlin/com/looker/droidify/database/DatabaseX.kt index 2c214f11..a37fcb72 100644 --- a/src/main/kotlin/com/looker/droidify/database/DatabaseX.kt +++ b/src/main/kotlin/com/looker/droidify/database/DatabaseX.kt @@ -21,7 +21,7 @@ import kotlinx.coroutines.launch CategoryTemp::class, Installed::class, Lock::class - ], version = 2 + ], version = 3 ) @TypeConverters(Converters::class) abstract class DatabaseX : RoomDatabase() { diff --git a/src/main/kotlin/com/looker/droidify/database/entity/Product.kt b/src/main/kotlin/com/looker/droidify/database/entity/Product.kt index 753ae2cd..7d8dd84d 100644 --- a/src/main/kotlin/com/looker/droidify/database/entity/Product.kt +++ b/src/main/kotlin/com/looker/droidify/database/entity/Product.kt @@ -20,6 +20,7 @@ open class Product { var icon = "" var metadataIcon = "" var releases: List = emptyList() + var categories: List = emptyList() // TODO Remove in next iteration @ColumnInfo(typeAffinity = ColumnInfo.BLOB)