From 330cef2702e8815af3d9732373c08ec09f5ee729 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 13 Aug 2024 17:06:17 -0400
Subject: [PATCH] Remove unnecessary full JobSpecs from job deletion code.

---
 .../securesms/jobs/FastJobStorage.kt             | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.kt
index 13c094e37b..180fc72ae9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.kt
@@ -289,19 +289,17 @@ class FastJobStorage(private val jobDatabase: JobDatabase) : JobStorage {
 
   @Synchronized
   override fun deleteJobs(ids: List<String>) {
-    val jobsToDelete: Set<JobSpec> = ids
-      .mapNotNull { getJobSpec(it) }
+    val jobsToDelete: Set<MinimalJobSpec> = ids
+      .mapNotNull { id ->
+        minimalJobs.firstOrNull { it.id == id }
+      }
       .toSet()
 
     val durableJobIdsToDelete: List<String> = jobsToDelete
       .filterNot { it.isMemoryOnly }
       .map { it.id }
 
-    val minimalJobsToDelete: Set<MinimalJobSpec> = jobsToDelete
-      .map { it.toMinimalJobSpec() }
-      .toSet()
-
-    val affectedQueues: Set<String> = minimalJobsToDelete.mapNotNull { it.queueKey }.toSet()
+    val affectedQueues: Set<String> = jobsToDelete.mapNotNull { it.queueKey }.toSet()
 
     if (durableJobIdsToDelete.isNotEmpty()) {
       jobDatabase.deleteJobs(durableJobIdsToDelete)
@@ -310,8 +308,8 @@ class FastJobStorage(private val jobDatabase: JobDatabase) : JobStorage {
     val deleteIds: Set<String> = ids.toSet()
     minimalJobs.removeIf { deleteIds.contains(it.id) }
     jobSpecCache.keys.removeAll(deleteIds)
-    eligibleJobs.removeAll(minimalJobsToDelete)
-    migrationJobs.removeAll(minimalJobsToDelete)
+    eligibleJobs.removeAll(jobsToDelete)
+    migrationJobs.removeAll(jobsToDelete)
 
     mostEligibleJobForQueue.keys.removeAll(affectedQueues)