From 94cf31eb295ad428f31c0b4d66bd5ca7b945d424 Mon Sep 17 00:00:00 2001
From: davotoula <david.kaspar@gmail.com>
Date: Fri, 20 Mar 2026 09:29:04 +0100
Subject: [PATCH] Intentionality: check the return value and log a warning via
 Log.w() when deletion fails

---
 .../service/uploads/MetadataStripper.kt       | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MetadataStripper.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MetadataStripper.kt
index 79987c74d..9e603f514 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MetadataStripper.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MetadataStripper.kt
@@ -171,7 +171,9 @@ object MetadataStripper {
             if (muxerStarted) runCatching { muxer?.stop() }
             muxer?.release()
             extractor.release()
-            if (!succeeded) outputFile.delete()
+            if (!succeeded && !outputFile.delete()) {
+                Log.w("MetadataStripper", "Failed to delete temp file: ${outputFile.absolutePath}")
+            }
         }
         return succeeded
     }
@@ -199,7 +201,9 @@ object MetadataStripper {
             val inputStream =
                 context.contentResolver.openInputStream(uri)
                     ?: run {
-                        tempFile.delete()
+                        if (!tempFile.delete()) {
+                            Log.w("MetadataStripper", "Failed to delete temp file: ${tempFile.absolutePath}")
+                        }
                         return StrippingResult(uri, false)
                     }
             inputStream.use { input ->
@@ -218,7 +222,9 @@ object MetadataStripper {
             StrippingResult(tempFile.toUri(), true)
         } catch (e: Exception) {
             if (e is CancellationException) throw e
-            tempFile?.delete()
+            if (tempFile?.delete() == false) {
+                Log.w("MetadataStripper", "Failed to delete temp file: ${tempFile.absolutePath}")
+            }
             Log.d("MetadataStripper", "Failed to strip image metadata: ${e.message}")
             StrippingResult(uri, false)
         }
@@ -304,7 +310,9 @@ object MetadataStripper {
                     input.copyTo(output)
                 }
             } ?: run {
-                tempInputFile.delete()
+                if (!tempInputFile.delete()) {
+                    Log.w("MetadataStripper", "Failed to delete temp file: ${tempInputFile.absolutePath}")
+                }
                 return StrippingResult(uri, false)
             }
 
@@ -345,7 +353,9 @@ object MetadataStripper {
             }
 
             if (startOffset == 0L && endOffset == fileSize) {
-                tempInputFile.delete()
+                if (!tempInputFile.delete()) {
+                    Log.w("MetadataStripper", "Failed to delete temp file: ${tempInputFile.absolutePath}")
+                }
                 tempInputFile = null
                 return StrippingResult(uri, true) // no tags found, already clean
             }
@@ -365,14 +375,18 @@ object MetadataStripper {
                     }
                 }
             }
-            tempInputFile.delete()
+            if (!tempInputFile.delete()) {
+                Log.w("MetadataStripper", "Failed to delete temp file: ${tempInputFile.absolutePath}")
+            }
             tempInputFile = null
 
             Log.d("MetadataStripper", "Stripped ID3 tags from MP3")
             StrippingResult(tempOutputFile.toUri(), true)
         } catch (e: Exception) {
             if (e is CancellationException) throw e
-            tempInputFile?.delete()
+            if (tempInputFile?.delete() == false) {
+                Log.w("MetadataStripper", "Failed to delete temp file: ${tempInputFile.absolutePath}")
+            }
             Log.d("MetadataStripper", "Failed to strip MP3 metadata: ${e.message}")
             StrippingResult(uri, false)
         }