From b867d4a5274496bf541b6ddd03933b630b31a471 Mon Sep 17 00:00:00 2001
From: Rahul Patel <whyorean@gmail.com>
Date: Wed, 26 Feb 2025 02:12:55 +0530
Subject: [PATCH] DownloadWorker: fix download status misinformation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-- cancellation ≠ failure
-- report cause of other failures
---
 .../aurora/store/data/work/DownloadWorker.kt  | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 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 937904344..0d6728296 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
@@ -44,6 +44,7 @@ import java.io.File
 import java.io.FileOutputStream
 import java.security.DigestInputStream
 import java.security.MessageDigest
+import kotlin.coroutines.cancellation.CancellationException
 import kotlin.properties.Delegates
 import com.aurora.gplayapi.data.models.File as GPlayFile
 
@@ -98,7 +99,7 @@ class DownloadWorker @AssistedInject constructor(
             icon = Bitmap.createScaledBitmap(bitmap, 96, 96, true)
         } catch (exception: Exception) {
             Log.e(TAG, "Failed to parse download data", exception)
-            onFailure()
+            onFailure(exception)
             return Result.failure()
         }
 
@@ -109,9 +110,10 @@ class DownloadWorker @AssistedInject constructor(
         download.fileList = download.fileList.ifEmpty {
             purchase(download.packageName, download.versionCode, download.offerType)
         }
+
         if (download.fileList.isEmpty()) {
             Log.i(TAG, "Nothing to download!")
-            onFailure(appContext.getString(R.string.purchase_failed))
+            onFailure()
             return Result.failure()
         }
 
@@ -153,14 +155,16 @@ class DownloadWorker @AssistedInject constructor(
                 .onFailure {
                     Log.e(TAG, "Failed to download ${download.packageName}", it)
                     downloading = false
-                    onFailure()
+
+                    onFailure(it as Exception)
+
                     return Result.failure()
                 }
             while (downloading) {
                 delay(1000)
                 val d = downloadDao.getDownload(download.packageName)
                 if (isStopped || d.downloadStatus == DownloadStatus.CANCELLED) {
-                    onFailure()
+                    onFailure(CancellationException())
                     break
                 }
             }
@@ -173,7 +177,7 @@ class DownloadWorker @AssistedInject constructor(
             requestList.forEach { require(verifyFile(it)) }
         } catch (exception: Exception) {
             Log.e(TAG, "Failed to verify downloaded files!", exception)
-            onFailure()
+            onFailure(exception)
             return Result.failure()
         }
 
@@ -195,18 +199,22 @@ class DownloadWorker @AssistedInject constructor(
         }
     }
 
-    private suspend fun onFailure(errorMessage: String? = null, exception: Exception? = null) {
+    private suspend fun onFailure(exception: Exception = Exception("Something went wrong!")) {
         withContext(NonCancellable) {
             Log.i(TAG, "Failed downloading ${download.packageName}")
             val cancelReasons = listOf(STOP_REASON_USER, STOP_REASON_CANCELLED_BY_APP)
             if (isSAndAbove && stopReason in cancelReasons) {
                 notifyStatus(DownloadStatus.CANCELLED)
             } else {
-                notifyStatus(DownloadStatus.FAILED)
-                AuroraApp.events.send(InstallerEvent.Failed(download.packageName).apply {
-                    extra = errorMessage ?: appContext.getString(R.string.download_failed)
-                    error = exception?.stackTraceToString() ?: String()
-                })
+                if (exception is CancellationException) {
+                    notifyStatus(DownloadStatus.CANCELLED)
+                } else {
+                    notifyStatus(DownloadStatus.FAILED)
+                    AuroraApp.events.send(InstallerEvent.Failed(download.packageName).apply {
+                        extra = exception.message ?: appContext.getString(R.string.download_failed)
+                        error = exception.stackTraceToString()
+                    })
+                }
             }
 
             notificationManager.cancel(NOTIFICATION_ID)