From 7a675db3d5b538d32b64d06ec1388bf75cfad4c8 Mon Sep 17 00:00:00 2001
From: machiav3lli <antonios.hazim@tutanota.com>
Date: Tue, 1 Feb 2022 02:45:15 +0100
Subject: [PATCH] Clean up

---
 src/main/kotlin/com/looker/droidify/Common.kt |  2 +-
 .../com/looker/droidify/database/DAOs.kt      |  9 ++++----
 .../droidify/installer/InstallerService.kt    | 23 ++++++++++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/main/kotlin/com/looker/droidify/Common.kt b/src/main/kotlin/com/looker/droidify/Common.kt
index 019e4d93..5cf18363 100644
--- a/src/main/kotlin/com/looker/droidify/Common.kt
+++ b/src/main/kotlin/com/looker/droidify/Common.kt
@@ -21,7 +21,7 @@ const val ROW_VERSION_CODE = "version_code"
 const val ROW_SIGNATURES = "signatures"
 const val ROW_COMPATIBLE = "compatible"
 const val ROW_DATA = "data"
-const val ROW_DATA_ITEM = "data_item"
+const val ROW_DATA_ITEM = "data_item" // TODO remove when time comes
 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 e56d5b41..0aeddba2 100644
--- a/src/main/kotlin/com/looker/droidify/database/DAOs.kt
+++ b/src/main/kotlin/com/looker/droidify/database/DAOs.kt
@@ -80,6 +80,9 @@ interface ProductDao : BaseDao<Product> {
     @Query("SELECT * FROM product WHERE package_name = :packageName")
     fun get(packageName: String): List<Product?>
 
+    @Query("SELECT * FROM product WHERE package_name = :packageName")
+    fun getLive(packageName: String): LiveData<List<Product?>>
+
     @Query("DELETE FROM product WHERE repository_id = :id")
     fun deleteById(id: Long): Int
 
@@ -285,12 +288,10 @@ interface InstalledDao : BaseDao<Installed> {
     }
 
     @Query("SELECT * FROM memory_installed WHERE package_name = :packageName")
+    fun get(packageName: String): Installed?
 
     @Query("SELECT * FROM memory_installed WHERE package_name = :packageName")
-    fun getObject(packageName: String): Installed?
-
-    @Query("SELECT * FROM memory_installed WHERE package_name = :packageName")
-    fun getObjectLive(packageName: String): LiveData<Installed?>
+    fun getLive(packageName: String): LiveData<Installed?>
 
     @Query("DELETE FROM memory_installed WHERE package_name = :packageName")
     fun delete(packageName: String)
diff --git a/src/main/kotlin/com/looker/droidify/installer/InstallerService.kt b/src/main/kotlin/com/looker/droidify/installer/InstallerService.kt
index 2e85ff97..82288d42 100644
--- a/src/main/kotlin/com/looker/droidify/installer/InstallerService.kt
+++ b/src/main/kotlin/com/looker/droidify/installer/InstallerService.kt
@@ -83,22 +83,23 @@ class InstallerService : Service() {
         val sessionInstaller = this.packageManager.packageInstaller
         val session = if (sessionId > 0) sessionInstaller.getSessionInfo(sessionId) else null
 
-        val name = session?.appPackageName ?: intent.getStringExtra(PackageInstaller.EXTRA_PACKAGE_NAME)
+        val name =
+            session?.appPackageName ?: intent.getStringExtra(PackageInstaller.EXTRA_PACKAGE_NAME)
         val message = intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE)
         val installerAction = intent.getStringExtra(KEY_ACTION)
 
         // get application name for notifications
         val appLabel = session?.appLabel ?: intent.getStringExtra(KEY_APP_NAME)
-            ?: try {
-                if (name != null) packageManager.getApplicationLabel(
-                    packageManager.getApplicationInfo(
-                        name,
-                        PackageManager.GET_META_DATA
-                    )
-                ) else null
-            } catch (_: Exception) {
-                null
-            }
+        ?: try {
+            if (name != null) packageManager.getApplicationLabel(
+                packageManager.getApplicationInfo(
+                    name,
+                    PackageManager.GET_META_DATA
+                )
+            ) else null
+        } catch (_: Exception) {
+            null
+        }
 
         val notificationTag = "${NOTIFICATION_TAG_PREFIX}$name"