From 15677c663b0adc29e9994f6112e979faee29684f Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Tue, 16 Dec 2025 09:13:49 -0500
Subject: [PATCH] Fix backup restore service concurrent modification crash on
 timeout.

---
 .../securesms/service/BackupMediaRestoreService.kt        | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/BackupMediaRestoreService.kt b/app/src/main/java/org/thoughtcrime/securesms/service/BackupMediaRestoreService.kt
index b76b229db0..a11d864e03 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/BackupMediaRestoreService.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/BackupMediaRestoreService.kt
@@ -161,7 +161,7 @@ class BackupMediaRestoreService : SafeForegroundService() {
   private fun stopDueToTimeout() {
     controllerLock.withLock {
       hasTimedOut = true
-      controllers.forEach { it.closeFromTimeout() }
+      controllers.clear()
       stop(context = this, fromTimeout = true)
     }
 
@@ -180,12 +180,6 @@ class BackupMediaRestoreService : SafeForegroundService() {
     val totalBytes: ByteSize
       get() = ArchiveRestoreProgress.state.totalRestoreSize
 
-    fun closeFromTimeout() {
-      controllerLock.withLock {
-        controllers.remove(this)
-      }
-    }
-
     override fun close() {
       controllerLock.withLock {
         controllers.remove(this)