File Captions 🏷️ #3406

rapterjet2004 · 2023-10-24T16:11:01Z

fixes Support "File caption" #3290

🖼️ Screenshots

Current impl

🚧 TODO

🏁 Checklist

⛑️ Tests (unit and/or integration) are included or not needed
🔖 Capability is checked or not needed
🔙 Backport requests are created or not needed: /backport to stable-xx.x
📅 Milestone is set
🌸 PR title is meaningful (if it should be in the changelog: is it meaningful to users?)

app/src/main/res/values/strings.xml

mahibi · 2023-11-03T08:06:50Z

Hi, I just stumbled across the screenshots that already show a draft for the "multiple images" feature.
The feature is postponed for now afaik, but I think we should align with the design of Server and iOS when it comes up.
So maybe @nickvergessen wants to keep this in mind when an overview ticket is created...?
Just want to make sure it's not totally different on each platform..

nickvergessen · 2023-11-03T08:52:17Z

Yeah multiple images are not part of the current scope

AndyScherzinger · 2023-11-06T16:15:26Z

app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPreviewMessageViewHolder.java

@@ -49,7 +54,36 @@ public IncomingPreviewMessageViewHolder(View itemView, Object payload) {
    @Override
    public void onBind(@NonNull ChatMessage message) {
        super.onBind(message);
-
+        if(!message.isVoiceMessage()) {
+            assert viewThemeUtils != null;


this will crash when not null, so I would suggest to implement it more defensive, as in skip if null, applies also for the below uses of assert where I would advise against in general.

AndyScherzinger · 2023-11-06T16:15:37Z

app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPreviewMessageViewHolder.java

@@ -48,6 +53,38 @@ public OutcomingPreviewMessageViewHolder(View itemView) {
    public void onBind(ChatMessage message) {
        super.onBind(message);

+        if(!message.isVoiceMessage()) {
+            assert viewThemeUtils != null;


AndyScherzinger · 2023-11-06T16:18:31Z

app/src/main/res/layout/dialog_file_attachment_preview.xml

+
+    </LinearLayout>
+
+</LinearLayout>


add empty line on the bottom

AndyScherzinger · 2023-11-06T17:54:03Z

from a visual perspective it be nice if the image and the caption could be combined so it looks more like a single message. With the current layout it looks like a image message and a text message.

rapterjet2004 · 2023-11-07T16:16:52Z

@AndyScherzinger

AndyScherzinger · 2023-11-07T19:17:30Z

@rapterjet2004 visual change looks great 👍 smallest papercut, please add some padding to filename and date so it matches the caption text's padding from the bubble. 👍👍👍

mahibi · 2023-11-08T12:26:10Z

great 👍

i saw some bugs when testing.
how to reproduce:

take photo & add caption
take another photo & add without caption

after second photo is posted, for first photo, "{file}" is shown as caption
for second photo, the bubble is shown also around filename and date, but only until chat refreshes. then no bubble is shown.

fileCaptionTest1.mp4

rapterjet2004 · 2023-11-08T15:52:42Z

issue-3290-file-caption-1.webm

I think I fixed it, but can you double check? @mahibi

mahibi · 2023-11-13T14:26:42Z

issue-3290-file-caption-1.webm

I think I fixed it, but can you double check? @mahibi

for me, there are no bubbles now for captions.
when i click on a caption it crashes:

 2023-11-13 15:20:52.141 27927-27927 AndroidRuntime          com.nextcloud.talk2                  E  FATAL EXCEPTION: main
                                                                                                    Process: com.nextcloud.talk2, PID: 27927
                                                                                                    android.util.AndroidRuntimeException: Calling startActivity() from outside of an Activity  context requires the FLAG_ACTIVITY_NEW_TASK flag. Is this really what you want?
                                                                                                    	at android.app.ContextImpl.startActivity(ContextImpl.java:1140)
                                                                                                    	at android.app.ContextImpl.startActivity(ContextImpl.java:1116)
                                                                                                    	at android.content.ContextWrapper.startActivity(ContextWrapper.java:441)
                                                                                                    	at com.nextcloud.talk.utils.message.MessageUtils.processMessageParameters$lambda$0(MessageUtils.kt:146)

rapterjet2004 · 2023-11-14T14:09:50Z

@mahibi that should have fixed it. I was theming the background, before setting it, which is why the bubble wasn't appearing, and I made it so that the caption and background should be unclickable.

- Added dialog_file_attachment_preview.xml - Added FileAttachmentPreviewFragment.kt - Edited ChatActivity to add captions to uploaded files, also refactored some code - Edited the Outgoing, Incoming, and Generic Preview holders to have a caption - Fixed some bugs with RemoteFileBrowser Signed-off-by: Julius Linus <[email protected]>

mahibi · 2023-11-16T14:48:23Z

Well done @rapterjet2004 👍

github-actions · 2023-11-16T14:53:43Z

Codacy

Lint

Type	master	PR
Warnings	89	89
Errors	0	0

SpotBugs

Category	Base	New
Bad practice	6	6
Correctness	10	10
Dodgy code	123	123
Internationalization	5	5
Malicious code vulnerability	3	3
Performance	8	8
Security	2	2
Total	157	157

github-actions · 2023-11-16T14:58:01Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/3406-talk.apk

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud Talk app.

github-actions · 2024-03-31T02:03:51Z

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

rapterjet2004 added enhancement New feature or request 2. developing Work in progress feature: 🗨️ chat labels Oct 24, 2023

rapterjet2004 self-assigned this Oct 24, 2023

rapterjet2004 commented Oct 25, 2023

View reviewed changes

app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved

rapterjet2004 force-pushed the issue-3290-file-caption branch from 5100228 to 4326c7e Compare October 31, 2023 16:25

rapterjet2004 force-pushed the issue-3290-file-caption branch from eca3dad to 7f864ce Compare November 3, 2023 12:46

rapterjet2004 requested review from mahibi and AndyScherzinger November 3, 2023 14:01

AndyScherzinger marked this pull request as ready for review November 3, 2023 14:06

rapterjet2004 force-pushed the issue-3290-file-caption branch from 97e9024 to 37e3458 Compare November 3, 2023 14:15

rapterjet2004 added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Nov 3, 2023

rapterjet2004 force-pushed the issue-3290-file-caption branch from 37e3458 to ec77c5a Compare November 3, 2023 14:41

AndyScherzinger reviewed Nov 6, 2023

View reviewed changes

rapterjet2004 force-pushed the issue-3290-file-caption branch from ec77c5a to 82952dd Compare November 7, 2023 16:07

AndyScherzinger added this to the 18.0.0 milestone Nov 8, 2023

rapterjet2004 force-pushed the issue-3290-file-caption branch from d94e964 to 76651b1 Compare November 8, 2023 16:02

AndyScherzinger self-requested a review November 8, 2023 17:20

rapterjet2004 force-pushed the issue-3290-file-caption branch from 76651b1 to f1bf83f Compare November 9, 2023 13:38

rapterjet2004 force-pushed the issue-3290-file-caption branch from 0aa5ada to 21b7264 Compare November 13, 2023 14:45

mahibi force-pushed the issue-3290-file-caption branch from 5b54dea to 5e362ae Compare November 16, 2023 14:47

mahibi approved these changes Nov 16, 2023

View reviewed changes

mahibi merged commit f6f9f35 into master Nov 16, 2023
14 of 15 checks passed

delete-merged-branch bot deleted the issue-3290-file-caption branch November 16, 2023 14:48

github-actions bot added the feedback-requested label Mar 31, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

File Captions 🏷️ #3406

File Captions 🏷️ #3406

rapterjet2004 commented Oct 24, 2023 •

edited by AndyScherzinger

Loading

mahibi commented Nov 3, 2023

nickvergessen commented Nov 3, 2023

AndyScherzinger Nov 6, 2023

AndyScherzinger Nov 6, 2023

AndyScherzinger Nov 6, 2023

AndyScherzinger commented Nov 6, 2023

rapterjet2004 commented Nov 7, 2023

AndyScherzinger commented Nov 7, 2023 •

edited

Loading

mahibi commented Nov 8, 2023 •

edited

Loading

rapterjet2004 commented Nov 8, 2023

mahibi commented Nov 13, 2023

rapterjet2004 commented Nov 14, 2023

mahibi commented Nov 16, 2023

github-actions bot commented Nov 16, 2023

github-actions bot commented Nov 16, 2023

github-actions bot commented Mar 31, 2024

File Captions 🏷️ #3406

File Captions 🏷️ #3406

Conversation

rapterjet2004 commented Oct 24, 2023 • edited by AndyScherzinger Loading

🖼️ Screenshots

Current impl

🚧 TODO

🏁 Checklist

mahibi commented Nov 3, 2023

nickvergessen commented Nov 3, 2023

AndyScherzinger Nov 6, 2023

Choose a reason for hiding this comment

AndyScherzinger Nov 6, 2023

Choose a reason for hiding this comment

AndyScherzinger Nov 6, 2023

Choose a reason for hiding this comment

AndyScherzinger commented Nov 6, 2023

rapterjet2004 commented Nov 7, 2023

AndyScherzinger commented Nov 7, 2023 • edited Loading

mahibi commented Nov 8, 2023 • edited Loading

rapterjet2004 commented Nov 8, 2023

mahibi commented Nov 13, 2023

rapterjet2004 commented Nov 14, 2023

mahibi commented Nov 16, 2023

github-actions bot commented Nov 16, 2023

Codacy

Lint

SpotBugs

github-actions bot commented Nov 16, 2023

github-actions bot commented Mar 31, 2024

rapterjet2004 commented Oct 24, 2023 •

edited by AndyScherzinger

Loading

AndyScherzinger commented Nov 7, 2023 •

edited

Loading

mahibi commented Nov 8, 2023 •

edited

Loading