cleanup

- remove function summaries for consistency, as they do not seem to be used anywhere else in  the project
- remove dead debug log statements
- removing timing test code
- include chunk count in IccProfile and fix variable name
- minor logic simplification

Author: 0xDE57

app/src/main/java/app/grapheneos/camera/capturer/ImageSaver.kt

@@ -162,19 +162,13 @@ class ImageSaver(
         processedJpegBytes = processExif(uncroppedJpegBytes)
 
         if (removeICCAfterCapture) {
-            val start = System.nanoTime()
-            val icc = extractIccFromJpeg(processedJpegBytes)
-            if (icc != null) {
-                val originalSize = processedJpegBytes.size
+            val iccProfile = extractIccFromJpeg(processedJpegBytes)
+            if (iccProfile != null) {
                 try {
-                    processedJpegBytes = stripBytes(processedJpegBytes, icc.start, icc.end)
+                    processedJpegBytes = stripBytes(processedJpegBytes, iccProfile.app2SectionStart, iccProfile.app2SectionLength)
                 } catch (e: Exception) {
                     Log.e("ICC_Profile", "Failed to strip ICC APP2 section: ${e.message}")
                 }
-                val end = System.nanoTime()
-                val durationMs = (end - start) / 1_000_000.0
-                Log.d("ICC_PROFILE",
-                    "stripped in ${durationMs}ms. orig: ${originalSize}, cur: ${processedJpegBytes.size} (${originalSize - processedJpegBytes.size})")
             }
         }
 

app/src/main/java/app/grapheneos/camera/util/JpegUtils.kt

@@ -4,22 +4,13 @@ import android.util.Log
 import java.io.ByteArrayOutputStream
 
 
-/**
- * Data class to hold the extracted ICC profile information.
- */
 data class IccProfile(
-    val start: Int,       // Start index of the APP2 section containing the ICC profile
-    val end: Int,         // End index of the APP2 section containing the ICC profile
-    // The full ICC profile bytes segment [signature + header + data] (this will be smaller than the total APP2 section)
+    val app2SectionStart: Int,  // Start index of the APP2 section containing the ICC profile
+    val app2SectionLength: Int, // Length of the entire APP2 section containing the ICC profile
+    val iccChunks: Int,
     val iccBytes: ByteArray
 )
 
-/**
- * Extracts the ICC profile from a JPEG byte array.
- * Based off iccDEV -> iccJpegDump
- * @param jpegBytes   The JPEG file contents.
- * @return            The ICC profile bytes, or null if none was found.
- */
 fun extractIccFromJpeg(jpegBytes: ByteArray): IccProfile? {
     val tag = "ICC_PROFILE"
 
@@ -55,7 +46,6 @@ fun extractIccFromJpeg(jpegBytes: ByteArray): IccProfile? {
         while (pos < jpegBytes.size && jpegBytes[pos] == 0xFF.toByte()) pos++
         if (pos >= jpegBytes.size) break
 
-        //Log.d(tag, "marker - %d: %02x %02x".format(markerPos, jpegBytes[markerPos].toInt() and 0xFF, jpegBytes[markerPos+1].toInt() and 0xFF))
         val marker = jpegBytes[pos].toInt() and 0xFF
         pos++   // move past the marker code
 
@@ -79,7 +69,6 @@ fun extractIccFromJpeg(jpegBytes: ByteArray): IccProfile? {
         // Handle APP2 segments that may contain ICC data
         if (marker == 0xE2 && payloadLength >= 14) {
             if (jpegBytes.copyOfRange(segStart, segStart + 12).contentEquals(iccSig)) {
-                //Log.d(tag, "sig found @ $segStart. starting pos $magicPos. Payload length $payloadLength bytes")
                 val seq = jpegBytes[segStart + 12].toInt() and 0xFF
                 val total = jpegBytes[segStart + 13].toInt() and 0xFF
 
@@ -107,20 +96,12 @@ fun extractIccFromJpeg(jpegBytes: ByteArray): IccProfile? {
                 if (magicPos < minStart) minStart = magicPos
                 if (chunkEnd > maxEnd) maxEnd = chunkEnd
 
-                // Include header in the returned bytes,
-                // store the FULL segment (signature + header + data) for the first chunk,
-                // and only the data for subsequent chunks.
-                val chunkData = if (seq == 1) {
-                    jpegBytes.copyOfRange(segStart, segStart + payloadLength)
-                } else {
-                    jpegBytes.copyOfRange(segStart + 14, segStart + payloadLength)
-                }
-
+                // store payload (excluding the 12‑byte signature + 2‑byte header)
+                val chunkData = jpegBytes.copyOfRange(segStart + 14, segStart + payloadLength)
                 chunks[seq - 1] = chunkData
                 seenChunks[seq - 1] = true
 
-                val chunkSize = if (seq == 1) payloadLength - 14 else payloadLength //exclude header on first section
-                Log.d(tag, "ICC_PROFILE APP2 chunk ${seq}/${total} (${chunkSize} bytes). found at [$segStart-$chunkEnd]. (${chunkEnd-segStart} bytes)")
+                Log.d(tag, "ICC_PROFILE APP2 chunk ${seq}/${total} (${payloadLength-14} bytes).")
             }
         }
 
@@ -146,29 +127,11 @@ fun extractIccFromJpeg(jpegBytes: ByteArray): IccProfile? {
     }
     val iccBytes = iccStream.toByteArray()
 
-    //debug output
-    /*
-    Log.d(tag, "--- ICC Profile Extraction Complete ---")
-    Log.d(tag, "Start Index: $minStart")
-    Log.d(tag, "End Index: $maxEnd")
-    Log.d(tag, "Total APP2 size: ${maxEnd - minStart}")
-    Log.d(tag, "ICC Size:  ${iccBytes.size} bytes") //including header
-    val preview = iccBytes.joinToString(" ") { "%02X".format(it) }
-    Log.d(tag, "Data Preview: $preview...")
-    Log.d(tag, "---------------------------------------")*/
     Log.d(tag, "ICC Profile found! Size: ${iccBytes.size} bytes. Total chunks: ${totalChunks}.")
 
-    return IccProfile(minStart, maxEnd - minStart, iccBytes)
+    return IccProfile(minStart, maxEnd - minStart, totalChunks, iccBytes)
 }
 
-/**
- * Returns a new ByteArray with the specified section removed.
- *
- * @param original The source byte array.
- * @param start The starting index of the section to remove.
- * @param length The number of bytes to remove.
- * @return A new ByteArray containing the remaining bytes.
- */
 fun stripBytes(original: ByteArray, start: Int, length: Int): ByteArray {
     if (length <= 0) return original.copyOf()
 
@@ -178,10 +141,6 @@ fun stripBytes(original: ByteArray, start: Int, length: Int): ByteArray {
         "Strip range ($start to ${start + length}) exceeds array size (${original.size})"
     }
 
-    /*
-    Log.d("ICC strip","start - %d: %02x".format(start, original[start].toInt() and 0xFF))
-    Log.d("ICC strip","end - %d: %02x".format(start+length, original[start+length].toInt() and 0xFF))
-    Log.d("ICC strip","length   - $length:")*/
     val newSize = original.size - length
     val result = ByteArray(newSize)