From f966630e8a7c68966aa7962bc42349cab4fd97aa Mon Sep 17 00:00:00 2001
From: machiav3lli <antonios.hazim@tutanota.com>
Date: Tue, 9 Nov 2021 23:36:50 +0100
Subject: [PATCH] Fix: Crashes caused by tables' names

---
 src/main/kotlin/com/looker/droidify/Common.kt    |  4 ++--
 .../kotlin/com/looker/droidify/database/DAOs.kt  | 16 ++++++++--------
 .../com/looker/droidify/database/Tables.kt       |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/kotlin/com/looker/droidify/Common.kt b/src/main/kotlin/com/looker/droidify/Common.kt
index 6dca68af..a1471b0d 100644
--- a/src/main/kotlin/com/looker/droidify/Common.kt
+++ b/src/main/kotlin/com/looker/droidify/Common.kt
@@ -30,8 +30,8 @@ const val ROW_MATCH_RANK = "match_rank"
 const val ROW_REPOSITORY_NAME = "repository"
 const val ROW_PRODUCT_NAME = "product"
 const val ROW_CATEGORY_NAME = "category"
-const val ROW_INSTALLED_NAME = "memory.installed"
-const val ROW_LOCK_NAME = "memory.lock"
+const val ROW_INSTALLED_NAME = "memory_installed"
+const val ROW_LOCK_NAME = "memory_lock"
 
 const val JOB_ID_SYNC = 1
 
diff --git a/src/main/kotlin/com/looker/droidify/database/DAOs.kt b/src/main/kotlin/com/looker/droidify/database/DAOs.kt
index 91c05098..774b410d 100644
--- a/src/main/kotlin/com/looker/droidify/database/DAOs.kt
+++ b/src/main/kotlin/com/looker/droidify/database/DAOs.kt
@@ -10,7 +10,7 @@ import com.looker.droidify.entity.ProductItem
 
 
 interface BaseDao<T> {
-    @Insert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insert(vararg product: T)
 
     @Update(onConflict = OnConflictStrategy.REPLACE)
@@ -191,25 +191,25 @@ interface InstalledDao : BaseDao<Installed> {
         }
     }
 
-    @Query("SELECT * FROM `memory.installed` WHERE package_name = :packageName")
+    @Query("SELECT * FROM memory_installed WHERE package_name = :packageName")
     fun get(packageName: String): Cursor
 
-    @Query("DELETE FROM 'memory.installed' WHERE package_name = :packageName")
+    @Query("DELETE FROM memory_installed WHERE package_name = :packageName")
     fun delete(packageName: String)
 }
 
 @Dao
 interface LockDao : BaseDao<Lock> {
-    @Query("DELETE FROM 'memory.lock' WHERE package_name = :packageName")
+    @Query("DELETE FROM memory_lock WHERE package_name = :packageName")
     fun delete(packageName: String)
 }
 
 @Dao
 interface ProductTempDao : BaseDao<ProductTemp> {
-    @get:Query("SELECT * FROM `product.temporary`")
+    @get:Query("SELECT * FROM temporary_product")
     val all: Array<ProductTemp>
 
-    @Query("DELETE FROM `product.temporary`")
+    @Query("DELETE FROM temporary_product")
     fun emptyTable()
 
     @Insert
@@ -249,9 +249,9 @@ interface ProductTempDao : BaseDao<ProductTemp> {
 
 @Dao
 interface CategoryTempDao : BaseDao<CategoryTemp> {
-    @get:Query("SELECT * FROM `category.temporary`")
+    @get:Query("SELECT * FROM temporary_category")
     val all: Array<CategoryTemp>
 
-    @Query("DELETE FROM `category.temporary`")
+    @Query("DELETE FROM temporary_category")
     fun emptyTable()
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/looker/droidify/database/Tables.kt b/src/main/kotlin/com/looker/droidify/database/Tables.kt
index 3b881cdc..cda3236e 100644
--- a/src/main/kotlin/com/looker/droidify/database/Tables.kt
+++ b/src/main/kotlin/com/looker/droidify/database/Tables.kt
@@ -50,7 +50,7 @@ open class Product {
     var data_item: ProductItem? = null
 }
 
-@Entity(tableName = "product.temporary")
+@Entity(tableName = "temporary_product")
 class ProductTemp : Product()
 
 @Entity(tableName = "category", primaryKeys = ["repository_id", "package_name", "name"])
@@ -60,10 +60,10 @@ open class Category {
     var name = ""
 }
 
-@Entity(tableName = "category.temporary")
+@Entity(tableName = "temporary_category")
 class CategoryTemp : Category()
 
-@Entity(tableName = "memory.installed")
+@Entity(tableName = "memory_installed")
 class Installed(pName: String = "") {
     @PrimaryKey
     var package_name = pName
@@ -73,7 +73,7 @@ class Installed(pName: String = "") {
     var signature = ""
 }
 
-@Entity(tableName = "memory.lock")
+@Entity(tableName = "memory_lock")
 class Lock {
     @PrimaryKey
     var package_name = ""