From c76459859dd93812e913cf3db89eac151d49e261 Mon Sep 17 00:00:00 2001 From: davotoula Date: Wed, 18 Mar 2026 10:38:04 +0100 Subject: [PATCH] feat: update all Screen call-sites for new stripMetadata onAdd parameter Add 6th Boolean parameter to onAdd lambdas in all 6 files that call ImageVideoDescription. The parameter is unused (_) for now in 5 sites and named in ShortNotePostScreen for future plumbing. Co-Authored-By: Claude Opus 4.6 --- .../java/com/vitorpamplona/amethyst/ui/actions/EditPostView.kt | 2 +- .../amethyst/ui/note/nip22Comments/GenericCommentPostScreen.kt | 2 +- .../ui/screen/loggedIn/chats/privateDM/send/NewGroupDMScreen.kt | 2 +- .../loggedIn/discover/nip99Classifieds/NewProductScreen.kt | 2 +- .../amethyst/ui/screen/loggedIn/home/ShortNotePostScreen.kt | 2 +- .../notifications/publicMessages/NewPublicMessageScreen.kt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostView.kt index f4978575b..9181ceed0 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostView.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostView.kt @@ -265,7 +265,7 @@ fun EditPostView( it, accountViewModel.account.settings.defaultFileServer, isUploading = postViewModel.mediaUploadTracker.isUploading, - onAdd = { alt, server, sensitiveContent, mediaQuality, _ -> + onAdd = { alt, server, sensitiveContent, mediaQuality, _, _ -> postViewModel.upload(alt, sensitiveContent, mediaQuality, false, server, accountViewModel.toastManager::toast, context) accountViewModel.account.settings.changeDefaultFileServer(server) }, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/GenericCommentPostScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/GenericCommentPostScreen.kt index c4f826825..f8b548e36 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/GenericCommentPostScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/GenericCommentPostScreen.kt @@ -301,7 +301,7 @@ private fun GenericCommentPostBody( it, accountViewModel.account.settings.defaultFileServer, isUploading = postViewModel.mediaUploadTracker.isUploading, - onAdd = { alt, server, sensitiveContent, mediaQuality, _ -> + onAdd = { alt, server, sensitiveContent, mediaQuality, _, _ -> postViewModel.upload(alt, if (sensitiveContent) "" else null, mediaQuality, server, accountViewModel.toastManager::toast, context) accountViewModel.account.settings.changeDefaultFileServer(server) }, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/NewGroupDMScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/NewGroupDMScreen.kt index 117f96d36..3509b2450 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/NewGroupDMScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/NewGroupDMScreen.kt @@ -288,7 +288,7 @@ fun GroupDMScreenContent( selectedFiles, accountViewModel.account.settings.defaultFileServer, isUploading = uploading.mediaUploadTracker.isUploading, - onAdd = { alt, server, sensitiveContent, mediaQuality, _ -> + onAdd = { alt, server, sensitiveContent, mediaQuality, _, _ -> postViewModel.uploadAndHold( accountViewModel.toastManager::toast, context, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductScreen.kt index 0400191e6..84795275f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductScreen.kt @@ -270,7 +270,7 @@ private fun NewProductBody( uris = it, defaultServer = accountViewModel.account.settings.defaultFileServer, isUploading = postViewModel.mediaUploadTracker.isUploading, - onAdd = { alt, server, sensitiveContent, mediaQuality, _ -> + onAdd = { alt, server, sensitiveContent, mediaQuality, _, _ -> postViewModel.upload(alt, if (sensitiveContent) "" else null, mediaQuality, server, accountViewModel.toastManager::toast, context) accountViewModel.account.settings.changeDefaultFileServer(server) }, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostScreen.kt index 7239f8e82..d8e7d66ee 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostScreen.kt @@ -357,7 +357,7 @@ private fun NewPostScreenBody( it, accountViewModel.account.settings.defaultFileServer, isUploading = postViewModel.mediaUploadTracker.isUploading, - onAdd = { alt, server, sensitiveContent, mediaQuality, useH265 -> + onAdd = { alt, server, sensitiveContent, mediaQuality, useH265, stripMetadata -> postViewModel.upload(alt, if (sensitiveContent) "" else null, mediaQuality, server, accountViewModel.toastManager::toast, context, useH265) accountViewModel.account.settings.changeDefaultFileServer(server) }, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageScreen.kt index d236275d1..cc894e145 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageScreen.kt @@ -247,7 +247,7 @@ fun PublicMessageScreenContent( it, accountViewModel.account.settings.defaultFileServer, isUploading = postViewModel.mediaUploadTracker.isUploading, - onAdd = { alt, server, sensitiveContent, mediaQuality, _ -> + onAdd = { alt, server, sensitiveContent, mediaQuality, _, _ -> postViewModel.upload(alt, if (sensitiveContent) "" else null, mediaQuality, server, accountViewModel.toastManager::toast, context) accountViewModel.account.settings.changeDefaultFileServer(server) },