From 8af3fde3742d640b315b4e2ff65c2f078beea58d Mon Sep 17 00:00:00 2001
From: Rahul Patel <whyorean@gmail.com>
Date: Wed, 26 Feb 2025 02:29:35 +0530
Subject: [PATCH] DownloadWorker: improve file verification

---
 .../aurora/store/data/work/DownloadWorker.kt  | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt b/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt
index 0d6728296..5e797c656 100644
--- a/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt
+++ b/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt
@@ -358,6 +358,7 @@ class DownloadWorker @AssistedInject constructor(
         when (status) {
             DownloadStatus.VERIFYING,
             DownloadStatus.CANCELLED -> return
+
             DownloadStatus.COMPLETED -> {
                 // Mark progress as 100 manually to avoid race conditions
                 download.progress = 100
@@ -379,20 +380,28 @@ class DownloadWorker @AssistedInject constructor(
     @OptIn(ExperimentalStdlibApi::class)
     private suspend fun verifyFile(gFile: GPlayFile): Boolean {
         val file = PathUtil.getLocalFile(appContext, gFile, download)
+
         val algorithm = if (gFile.sha256.isBlank()) Algorithm.SHA1 else Algorithm.SHA256
         val expectedSha = if (algorithm == Algorithm.SHA1) gFile.sha1 else gFile.sha256
 
+        if (expectedSha.isBlank()) return false
+
         return withContext(Dispatchers.IO) {
-            val messageDigest = MessageDigest.getInstance(algorithm.value)
-            DigestInputStream(file.inputStream(), messageDigest).use { input ->
-                val buffer = ByteArray(DEFAULT_BUFFER_SIZE)
-                var read = input.read(buffer, 0, DEFAULT_BUFFER_SIZE)
-                while (read > -1) {
-                    read = input.read(buffer, 0, DEFAULT_BUFFER_SIZE)
+            try {
+                val messageDigest = MessageDigest.getInstance(algorithm.value)
+                file.inputStream().use { fis ->
+                    DigestInputStream(fis, messageDigest).use { dis ->
+                        val buffer = ByteArray(DEFAULT_BUFFER_SIZE)
+                        while (dis.read(buffer) != -1) { /* Just read, digest updates automatically */
+                        }
+                    }
                 }
+
+                messageDigest.digest().toHexString() == expectedSha
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to verify $file", e)
+                false
             }
-            val sha = messageDigest.digest().toHexString()
-            return@withContext sha == expectedSha
         }
     }
 }