feat: allow pasting images as png #17877

criticalAY · 2025-01-26T14:49:14Z

Purpose / Description

Anki preserves the image format unless Paste as png is turned on, this PR allow the user to preserve the image format unless the option is turned on

Fixes

Fixes If you copy / paste an image via clipboard into Android, it does not seem to result in anything but JPG #17841

How Has This Been Tested?

Tested on API 35 -> Google Emulator

Approach

MediaRegistration class was context dependent which is not a good practice hence converted it to Object
onPaste ran a check to see if we want to convert a image to JPG or not, but Anki doesn't do that and preserves the image extension and in case paste as PNG is turned on then pastes the images as png, hence I updated the code to remove these JPG checks and proceed with original extension unless the paste as PNG is turned on
fetch the boolean from col to see if we want to paste the image as PNG in NoteEditor
finally proceed to paste the image

Checklist

Please, go through these checks before submitting the PR.

You have a descriptive commit message with a short title (first line, max 50 chars).
You have commented your code, particularly in hard-to-understand areas
You have performed a self-review of your own code
UI changes: include screenshots of all affected screens (in particular showing any new or changed strings)
UI Changes: You have tested your change using the Google Accessibility Scanner

github-actions · 2025-01-26T14:49:25Z

Important

Maintainers: This PR contains Strings changes

Sync Translations before merging this PR and wait for the action to complete
Review and merge the auto-generated PR in order to sync all user-submitted translations
Sync Translations again and merge the PR so the huge automated string changes caused by merging this PR are by themselves and easy to review

AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt

BrayanDSO

This is harder to review than it should. There is only one commit, it has no description at all, and it does a lot of different stuff that could be split. Also, the PR's description Approach field was removed.

I suggest reading Arthur's guide of splitting into atomic commits. Here are some stuff that is happening in the single commit that could be split:

The new Editing preference category (although I'd remove it)
Moving the paste_png_key constant
Making MediaRegistration an object`
Adding the MediaError enum
Changing MediaRegistration docs

Probably there are more stuff to split. Also add description to your commits to justify why you are doing X and Y

criticalAY · 2025-01-29T22:26:13Z

I was not expecting this comment 😅, thought the changes where self explanatory, purposely kept a single commit. But thanks for it I don't want to waste reviewers time so can do it

BrayanDSO · 2025-01-29T22:29:10Z

thought the changes where self explanatory,

That's what everyone tend to think (including myself) because they were "living" their code, but most stuff aren't.

mikehardy · 2025-01-30T00:59:18Z

I'll admit I scanned this but it was kind of a big blob of jumbled things so I noped out 😅 - will appreciate the split

- Remove summary from the paste png category as Anki doesn't have it, (images are pasted with original ext) - Shift the pastePNG under editing preference

- Remove context from constructor and converted the class to Object as we don't memory leaks - Avoids tight coupling

criticalAY · 2025-01-30T17:49:39Z

I have updated the approach in my PR as well as split the commits, thanks!

BrayanDSO

Not all commits can be compiled, so this should be squashed

AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt

BrayanDSO · 2025-02-07T22:45:55Z

Splitting the PR in commits helped a lot in reviewing. Thanks for that

AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt

david-allison · 2025-02-08T18:36:12Z

AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt

+        ): String =
+            when (this) {
+                GENERIC_ERROR -> context.getString(R.string.multimedia_editor_something_wrong)
+                CONVERSION_ERROR -> context.getString(R.string.multimedia_editor_png_paste_error, message)


Should message be provided to the constructor, rather than the method?

it would be better to pass the message as an argument only one places uses that

Implementer's choice, this reads better to me

Subject: [PATCH] --- Index: AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt b/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt --- a/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt (revision b30f4ca8b2d075bb38933d8f32420cc793bf5410) +++ b/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt (date 1739070568019) @@ -35,6 +35,8 @@ import java.io.IOException import java.io.InputStream +private typealias DisplayMediaError = (MediaRegistration.MediaError) -> Unit + /** * Utility class for media registration and handling errors during media paste actions. */ @@ -42,23 +44,22 @@ /** * Represents different types of media errors. */ - enum class MediaError { - GENERIC_ERROR, - CONVERSION_ERROR, - IMAGE_TOO_LARGE, - VIDEO_TO_LARGE, - AUDIO_TOO_LARGE, ; + sealed class MediaError { + data object GenericError : MediaError() + class ConversionError(val message: String) : MediaError() + data object ImageTooLarge : MediaError() + data object VideoTooLarge : MediaError() + data object AudioTooLarge : MediaError() fun toHumanReadableString( context: Context, - message: String, ): String = when (this) { - GENERIC_ERROR -> context.getString(R.string.multimedia_editor_something_wrong) - CONVERSION_ERROR -> context.getString(R.string.multimedia_editor_png_paste_error, message) - IMAGE_TOO_LARGE -> context.getString(R.string.note_editor_image_too_large) - VIDEO_TO_LARGE -> context.getString(R.string.note_editor_video_too_large) - AUDIO_TOO_LARGE -> context.getString(R.string.note_editor_audio_too_large) + is GenericError -> context.getString(R.string.multimedia_editor_something_wrong) + is ConversionError -> context.getString(R.string.multimedia_editor_png_paste_error, message) + is ImageTooLarge -> context.getString(R.string.note_editor_image_too_large) + is VideoTooLarge -> context.getString(R.string.note_editor_video_too_large) + is AudioTooLarge -> context.getString(R.string.note_editor_audio_too_large) } } @@ -83,7 +84,7 @@ uri: Uri, description: ClipDescription, pasteAsPng: Boolean, - showError: (type: MediaError, message: String?) -> Unit, + showError: DisplayMediaError, ): String? = try { loadMediaIntoCollection(context, uri, description, pasteAsPng, showError) @@ -95,17 +96,17 @@ // org.chromium.chrome.browser.util.ChromeFileProvider from ProcessRecord{80125c 11262:com.ichi2.anki/u0a455} // (pid=11262, uid=10455) that is not exported from UID 10057 Timber.w(ex, "Failed to paste media") - showError(MediaError.GENERIC_ERROR, null) + showError(MediaError.GenericError) null } catch (ex: SecurityException) { Timber.w(ex, "Failed to paste media") - showError(MediaError.GENERIC_ERROR, null) + showError(MediaError.GenericError) null } catch (e: Exception) { // NOTE: This is happy path coding which works on Android 9. CrashReportService.sendExceptionReport("File is invalid issue:8880", "RegisterMediaForWebView:onImagePaste URI of file:$uri") Timber.w(e, "Failed to paste media") - showError(MediaError.GENERIC_ERROR, null) + showError(MediaError.GenericError) null } @@ -123,14 +124,14 @@ bytesWritten: Long, isImage: Boolean, isVideo: Boolean, - showError: (type: MediaError) -> Unit, + showError: DisplayMediaError, ): Boolean { if (bytesWritten <= MEDIA_MAX_SIZE_BYTES) return true when { - isImage -> showError(MediaError.IMAGE_TOO_LARGE) - isVideo -> showError(MediaError.VIDEO_TO_LARGE) - else -> showError(MediaError.AUDIO_TOO_LARGE) + isImage -> showError(MediaError.ImageTooLarge) + isVideo -> showError(MediaError.VideoTooLarge) + else -> showError(MediaError.AudioTooLarge) } return false } @@ -146,7 +147,7 @@ uri: Uri, description: ClipDescription, pasteAsPng: Boolean, - showError: (type: MediaError, message: String?) -> Unit, + showError: DisplayMediaError, ): String? { val filename = getFileName(context.contentResolver, uri) val fd = openInputStreamWithURI(context, uri) @@ -179,10 +180,7 @@ } Timber.d("File was %d bytes", bytesWritten) - val checkMediaSize = - checkMediaSize(bytesWritten, isImage, isVideo) { errorType -> - showError(errorType, null) - } + val checkMediaSize = checkMediaSize(bytesWritten, isImage, isVideo, showError) if (!checkMediaSize) { File(tempFilePath).delete() @@ -204,7 +202,7 @@ private fun convertToPNG( file: File, - showError: (type: MediaError, message: String?) -> Unit, + showError: DisplayMediaError, ): Boolean { val bm = BitmapFactory.decodeFile(file.absolutePath) try { @@ -215,7 +213,7 @@ } catch (e: IOException) { Timber.w("MediaRegistration : Unable to convert file to png format") CrashReportService.sendExceptionReport(e, "Unable to convert file to png format") - showError(MediaError.CONVERSION_ERROR, e.message) + showError(MediaError.ConversionError(e.message ?: "")) return false } return true Index: AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt --- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt (revision b30f4ca8b2d075bb38933d8f32420cc793bf5410) +++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt (date 1739070600643) @@ -2025,9 +2025,7 @@ uri, description, pasteAsPng, - showError = { type, message -> - showSnackbar(type.toHumanReadableString(requireContext(), message ?: "")) - }, + showError = { type -> showSnackbar(type.toHumanReadableString(requireContext())) }, ) ?: return false insertStringInField(editText, mediaTag)

AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt

AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt

- presernce the original extension of the images unless pasteAsPng is true - use the new MediaError enum class for errors - remove shouldConvertToJPG method as we don't want this check, new pasteAsPng parameter handles it

- We get the Boolean via PASTE_IMAGES_AS_PNG from collection to see if we want to preserve the image extension or not and proceed to paste the image

david-allison

Deeper review, a couple of bugs in the 'load into collection' method

david-allison · 2025-02-09T02:45:45Z

AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt

    ): String? {
        val filename = getFileName(context.contentResolver, uri)
-        val fd = openInputStreamWithURI(uri)
+        val fd = openInputStreamWithURI(context, uri)


I worry this isn't closed

AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt

david-allison · 2025-02-09T03:10:59Z

AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt

+        ): String =
+            when (this) {
+                GENERIC_ERROR -> context.getString(R.string.multimedia_editor_something_wrong)
+                CONVERSION_ERROR -> context.getString(R.string.multimedia_editor_png_paste_error, message)


Implementer's choice, this reads better to me

Subject: [PATCH] --- Index: AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt b/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt --- a/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt (revision b30f4ca8b2d075bb38933d8f32420cc793bf5410) +++ b/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt (date 1739070568019) @@ -35,6 +35,8 @@ import java.io.IOException import java.io.InputStream +private typealias DisplayMediaError = (MediaRegistration.MediaError) -> Unit + /** * Utility class for media registration and handling errors during media paste actions. */ @@ -42,23 +44,22 @@ /** * Represents different types of media errors. */ - enum class MediaError { - GENERIC_ERROR, - CONVERSION_ERROR, - IMAGE_TOO_LARGE, - VIDEO_TO_LARGE, - AUDIO_TOO_LARGE, ; + sealed class MediaError { + data object GenericError : MediaError() + class ConversionError(val message: String) : MediaError() + data object ImageTooLarge : MediaError() + data object VideoTooLarge : MediaError() + data object AudioTooLarge : MediaError() fun toHumanReadableString( context: Context, - message: String, ): String = when (this) { - GENERIC_ERROR -> context.getString(R.string.multimedia_editor_something_wrong) - CONVERSION_ERROR -> context.getString(R.string.multimedia_editor_png_paste_error, message) - IMAGE_TOO_LARGE -> context.getString(R.string.note_editor_image_too_large) - VIDEO_TO_LARGE -> context.getString(R.string.note_editor_video_too_large) - AUDIO_TOO_LARGE -> context.getString(R.string.note_editor_audio_too_large) + is GenericError -> context.getString(R.string.multimedia_editor_something_wrong) + is ConversionError -> context.getString(R.string.multimedia_editor_png_paste_error, message) + is ImageTooLarge -> context.getString(R.string.note_editor_image_too_large) + is VideoTooLarge -> context.getString(R.string.note_editor_video_too_large) + is AudioTooLarge -> context.getString(R.string.note_editor_audio_too_large) } } @@ -83,7 +84,7 @@ uri: Uri, description: ClipDescription, pasteAsPng: Boolean, - showError: (type: MediaError, message: String?) -> Unit, + showError: DisplayMediaError, ): String? = try { loadMediaIntoCollection(context, uri, description, pasteAsPng, showError) @@ -95,17 +96,17 @@ // org.chromium.chrome.browser.util.ChromeFileProvider from ProcessRecord{80125c 11262:com.ichi2.anki/u0a455} // (pid=11262, uid=10455) that is not exported from UID 10057 Timber.w(ex, "Failed to paste media") - showError(MediaError.GENERIC_ERROR, null) + showError(MediaError.GenericError) null } catch (ex: SecurityException) { Timber.w(ex, "Failed to paste media") - showError(MediaError.GENERIC_ERROR, null) + showError(MediaError.GenericError) null } catch (e: Exception) { // NOTE: This is happy path coding which works on Android 9. CrashReportService.sendExceptionReport("File is invalid issue:8880", "RegisterMediaForWebView:onImagePaste URI of file:$uri") Timber.w(e, "Failed to paste media") - showError(MediaError.GENERIC_ERROR, null) + showError(MediaError.GenericError) null } @@ -123,14 +124,14 @@ bytesWritten: Long, isImage: Boolean, isVideo: Boolean, - showError: (type: MediaError) -> Unit, + showError: DisplayMediaError, ): Boolean { if (bytesWritten <= MEDIA_MAX_SIZE_BYTES) return true when { - isImage -> showError(MediaError.IMAGE_TOO_LARGE) - isVideo -> showError(MediaError.VIDEO_TO_LARGE) - else -> showError(MediaError.AUDIO_TOO_LARGE) + isImage -> showError(MediaError.ImageTooLarge) + isVideo -> showError(MediaError.VideoTooLarge) + else -> showError(MediaError.AudioTooLarge) } return false } @@ -146,7 +147,7 @@ uri: Uri, description: ClipDescription, pasteAsPng: Boolean, - showError: (type: MediaError, message: String?) -> Unit, + showError: DisplayMediaError, ): String? { val filename = getFileName(context.contentResolver, uri) val fd = openInputStreamWithURI(context, uri) @@ -179,10 +180,7 @@ } Timber.d("File was %d bytes", bytesWritten) - val checkMediaSize = - checkMediaSize(bytesWritten, isImage, isVideo) { errorType -> - showError(errorType, null) - } + val checkMediaSize = checkMediaSize(bytesWritten, isImage, isVideo, showError) if (!checkMediaSize) { File(tempFilePath).delete() @@ -204,7 +202,7 @@ private fun convertToPNG( file: File, - showError: (type: MediaError, message: String?) -> Unit, + showError: DisplayMediaError, ): Boolean { val bm = BitmapFactory.decodeFile(file.absolutePath) try { @@ -215,7 +213,7 @@ } catch (e: IOException) { Timber.w("MediaRegistration : Unable to convert file to png format") CrashReportService.sendExceptionReport(e, "Unable to convert file to png format") - showError(MediaError.CONVERSION_ERROR, e.message) + showError(MediaError.ConversionError(e.message ?: "")) return false } return true Index: AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt --- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt (revision b30f4ca8b2d075bb38933d8f32420cc793bf5410) +++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt (date 1739070600643) @@ -2025,9 +2025,7 @@ uri, description, pasteAsPng, - showError = { type, message -> - showSnackbar(type.toHumanReadableString(requireContext(), message ?: "")) - }, + showError = { type -> showSnackbar(type.toHumanReadableString(requireContext())) }, ) ?: return false insertStringInField(editText, mediaTag)

david-allison · 2025-02-09T03:16:42Z

AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt

+                showError(errorType, null)
+            }
+
+        if (!checkMediaSize) {


⚠️ This is called after registerMediaForWebView, the file is already in the collection, and this doesn't delete it

david-allison · 2025-02-09T03:25:50Z

AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt

@@ -54,11 +142,14 @@ class MediaRegistration(
     */
    @Throws(IOException::class)
    fun loadMediaIntoCollection(


I think this is a candidate for some refactoring, given the bugs below:

remove the Android dependencies (Context/Uri/ClipDescription), and handle them outside the method

loadMediaIntoCollection should accept a validated MediaFile

It should add it into the collection, where registerMediaForWebView is inlined

It should return a Field representing the

david-allison · 2025-02-09T03:26:26Z

AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt

                bytesWritten = CompatHelper.compat.copyFile(fd, clipCopy.absolutePath)
-                // return null if jpg conversion false.
-                if (!convertToJPG(clipCopy)) {
+                if (!convertToPNG(clipCopy, showError)) {


⚠️ bytesWritten is used below to validate the size, but this measures the copied file, not the converted file

github-actions bot added the Strings label Jan 26, 2025

criticalAY force-pushed the feat-pref_editing branch 2 times, most recently from fbf67bd to aad3c14 Compare January 26, 2025 15:00

criticalAY added the Needs Review label Jan 26, 2025

david-allison reviewed Jan 29, 2025

View reviewed changes

AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt Outdated Show resolved Hide resolved

criticalAY force-pushed the feat-pref_editing branch from aad3c14 to 7ccc171 Compare January 29, 2025 21:35

BrayanDSO requested changes Jan 29, 2025

View reviewed changes

BrayanDSO added Needs Author Reply Waiting for a reply from the original author and removed Needs Review labels Jan 29, 2025

criticalAY added 3 commits January 30, 2025 22:43

refactor: create editing preference category

ed8ddc2

- Remove summary from the paste png category as Anki doesn't have it, (images are pasted with original ext) - Shift the pastePNG under editing preference

refactor: convert MediaRegistration class to object

7263292

- Remove context from constructor and converted the class to Object as we don't memory leaks - Avoids tight coupling

feat: introduced MediaError enum class

9df9038

criticalAY force-pushed the feat-pref_editing branch from 7ccc171 to 9337c43 Compare January 30, 2025 17:43

criticalAY requested review from BrayanDSO and david-allison January 30, 2025 17:48

criticalAY added Needs Review and removed Needs Author Reply Waiting for a reply from the original author labels Jan 30, 2025

BrayanDSO reviewed Feb 7, 2025

View reviewed changes

AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt Outdated Show resolved Hide resolved

AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt Outdated Show resolved Hide resolved

AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt Outdated Show resolved Hide resolved

BrayanDSO added the squash-merge The pull request currently requires maintainers to "Squash Merge" label Feb 7, 2025

criticalAY force-pushed the feat-pref_editing branch 2 times, most recently from ec04ef1 to 8747c93 Compare February 8, 2025 09:20

criticalAY requested a review from BrayanDSO February 8, 2025 09:20

david-allison requested changes Feb 8, 2025

View reviewed changes

david-allison added the Needs Author Reply Waiting for a reply from the original author label Feb 8, 2025

refactor: onPaste method to use original image extension

aed6a96

- presernce the original extension of the images unless pasteAsPng is true - use the new MediaError enum class for errors - remove shouldConvertToJPG method as we don't want this check, new pasteAsPng parameter handles it

criticalAY force-pushed the feat-pref_editing branch from 8747c93 to ac56aba Compare February 8, 2025 22:05

refactor: NoteEditor to use the updated MediaRegistration code

b30f4ca

- We get the Boolean via PASTE_IMAGES_AS_PNG from collection to see if we want to preserve the image extension or not and proceed to paste the image

criticalAY force-pushed the feat-pref_editing branch from ac56aba to b30f4ca Compare February 8, 2025 22:10

criticalAY removed the Needs Author Reply Waiting for a reply from the original author label Feb 8, 2025

criticalAY requested a review from david-allison February 8, 2025 22:11

david-allison requested changes Feb 9, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: allow pasting images as png #17877

feat: allow pasting images as png #17877

criticalAY commented Jan 26, 2025 •

edited

Loading

github-actions bot commented Jan 26, 2025

BrayanDSO left a comment

criticalAY commented Jan 29, 2025

BrayanDSO commented Jan 29, 2025

mikehardy commented Jan 30, 2025

criticalAY commented Jan 30, 2025

BrayanDSO left a comment

BrayanDSO commented Feb 7, 2025

david-allison Feb 8, 2025

criticalAY Feb 8, 2025

david-allison Feb 9, 2025

david-allison left a comment

david-allison Feb 9, 2025

david-allison Feb 9, 2025

david-allison Feb 9, 2025 •

edited

Loading

david-allison Feb 9, 2025

david-allison Feb 9, 2025 •

edited

Loading

feat: allow pasting images as png #17877

Are you sure you want to change the base?

feat: allow pasting images as png #17877

Conversation

criticalAY commented Jan 26, 2025 • edited Loading

Purpose / Description

Fixes

How Has This Been Tested?

Approach

Checklist

github-actions bot commented Jan 26, 2025

BrayanDSO left a comment

Choose a reason for hiding this comment

criticalAY commented Jan 29, 2025

BrayanDSO commented Jan 29, 2025

mikehardy commented Jan 30, 2025

criticalAY commented Jan 30, 2025

BrayanDSO left a comment

Choose a reason for hiding this comment

BrayanDSO commented Feb 7, 2025

david-allison Feb 8, 2025

Choose a reason for hiding this comment

criticalAY Feb 8, 2025

Choose a reason for hiding this comment

david-allison Feb 9, 2025

Choose a reason for hiding this comment

david-allison left a comment

Choose a reason for hiding this comment

david-allison Feb 9, 2025

Choose a reason for hiding this comment

david-allison Feb 9, 2025

Choose a reason for hiding this comment

david-allison Feb 9, 2025 • edited Loading

Choose a reason for hiding this comment

david-allison Feb 9, 2025

Choose a reason for hiding this comment

david-allison Feb 9, 2025 • edited Loading

Choose a reason for hiding this comment

criticalAY commented Jan 26, 2025 •

edited

Loading

david-allison Feb 9, 2025 •

edited

Loading

david-allison Feb 9, 2025 •

edited

Loading