Export retained notification images in HTML

app/src/main/java/se/ajpanton/notificationlog/ViewLogsFragment.kt

@@ -11,6 +11,7 @@ import android.widget.TextView
 import androidx.fragment.app.Fragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import se.ajpanton.notificationlog.data.EncryptedNotificationLogStore
+import se.ajpanton.notificationlog.data.EncryptedImageStore
 import se.ajpanton.notificationlog.databinding.FragmentViewLogsBinding
 import se.ajpanton.notificationlog.model.NotificationLogEntry
 import se.ajpanton.notificationlog.settings.LogField
@@ -126,8 +127,20 @@ class ViewLogsFragment : Fragment(R.layout.fragment_view_logs) {
                 ExportFormat.FORMATTED -> output.write(LogExporter.formatted(entries, settings).encodeToByteArray())
                 ExportFormat.HTML_ZIP -> ZipOutputStream(output).use { zip ->
                     zip.putNextEntry(java.util.zip.ZipEntry("notification-log.html"))
-                    zip.write(LogExporter.html(entries, settings).encodeToByteArray())
+                    val imageStore = EncryptedImageStore(context)
+                    val imageEntries = entries.filter { it.imageId != null && LogField.CONTENTS in settings.visibleFields }
+                    val exportedImages = imageEntries.mapNotNull { entry ->
+                        imageStore.read(entry.imageId!!)?.let { entry.imageId to it }
+                    }.toMap()
+                    zip.write(LogExporter.html(entries, settings) { entry ->
+                        entry.imageId?.takeIf(exportedImages::containsKey)?.let { "images/$it.png" }
+                    }.encodeToByteArray())
                     zip.closeEntry()
+                    exportedImages.forEach { (imageId, image) ->
+                        zip.putNextEntry(java.util.zip.ZipEntry("images/$imageId.png"))
+                        zip.write(image)
+                        zip.closeEntry()
+                    }
                 }
             } }
         }.start()