FIxed deletion of voice, video, image, contact and location messages #3319

Smarshal21 · 2023-09-16T11:06:43Z

🖼️ Screenshots

🏚️ Before | 🏡 After

🚧 TODO

Fix the deletion of voice, video, image, contact and location messages

🏁 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?)

Smarshal21 · 2023-09-17T13:20:16Z

@AndyScherzinger PTAL

AndyScherzinger

Breaks the calculation of the delete action by overwritting it. So the original place in the ChatActivity needs to be adapted yet not as simply as done here since there are further rules in place which determine if a chat message can be deleted.

So I think this needs some further work and alignment with @nickvergessen

mahibi · 2023-09-27T10:44:56Z

@Smarshal21
in ChatActivity in method isShowMessageDeletionButton, delete the following lines in the return statement:

message.hasFileAttachment() -> false       # deleting this line should allow deletion of voice, video, image, contact
OBJECT_MESSAGE == message.message -> false    # deleting this line should allow deletion of location

AndyScherzinger · 2023-09-27T12:14:49Z

@mahibi

wouldn't

message.hasFileAttachment() -> false       # deleting this line should allow deletion of voice, video, image, contact

also apply for any other file type then? like "documents" ? Just asking to be sure.

mahibi · 2023-09-27T13:33:05Z

...also apply for any other file type then? like "documents" ? Just asking to be sure.

yes that's true, it's for all other file types as well. but that's okay as far as i know.

mahibi · 2023-09-27T13:39:32Z

One more change i suggest:

Shared files from the Nextcloud instance are handled differently. Currently with a long click it's only possible to "Open in files app", other options like deletion are not available.
To change this, i suggest to remove the
onMessageViewLongClick method
in PreviewMessageViewHolder
and instead of

                clickView!!.setOnLongClickListener { l: View? ->
                    onMessageViewLongClick(message)
                    true
                }

just open the MessageActionDialog via

                clickView!!.setOnLongClickListener { l: View? ->
                    previewMessageInterface!!.onPreviewMessageLongClick(message)
                    true
                }

This would allow reactions and all the other options just like in web.

@Smarshal21 just in case anything is confusing for you, just let me know if i should do these commits

Smarshal21 · 2023-09-27T13:41:09Z

No i would like to handle that

Smarshal21 · 2023-09-27T15:52:38Z

One more change i suggest:

Shared files from the Nextcloud instance are handled differently. Currently with a long click it's only possible to "Open in files app", other options like deletion are not available. To change this, i suggest to remove the onMessageViewLongClick method in PreviewMessageViewHolder and instead of
                clickView!!.setOnLongClickListener { l: View? ->
                    onMessageViewLongClick(message)
                    true
                }
just open the MessageActionDialog via
                clickView!!.setOnLongClickListener { l: View? ->
                    previewMessageInterface!!.onPreviewMessageLongClick(message)
                    true
                }
This would allow reactions and all the other options just like in web.

@Smarshal21 just in case anything is confusing for you, just let me know if i should do these commits

Done 👍🏻

mahibi · 2023-09-29T09:08:45Z

app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt

@@ -128,7 +128,7 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) :
                    )
                }
                clickView!!.setOnLongClickListener { l: View? ->
-                    onMessageViewLongClick(message)
+                    previewMessageInterface!!.onPreviewMessageLongClick(message)


as the method
private fun onMessageViewLongClick(message: ChatMessage)..
is no longer used it can be deleted.
https://github.com/nextcloud/talk-android/pull/3319/files#diff-d097b26ec3d15c322bf4cf32bdb89ba37a00fd8c41bde2109848e68b0e559729R283

mahibi · 2023-09-29T09:11:39Z

app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt

@@ -104,7 +104,7 @@ class MessageActionsDialog(
                hasUserActorId(message) &&
                currentConversation?.type != ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL
        )
-        initMenuDeleteMessage(showMessageDeletionButton)
+        initMenuDeleteMessage(ChatMessage.MessageType.SYSTEM_MESSAGE != message.getCalculateMessageType())


this needs to be reverted to be showMessageDeletionButton again so the logic from ChatActivity to show/hide the deletion button is used.

talk-android/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

Line 4172 in 288ec68

private fun isShowMessageDeletionButton(message: ChatMessage): Boolean {

mahibi · 2023-09-29T09:19:06Z

@Smarshal21 please make sure to always sign your commits
https://github.com/nextcloud/talk-android/blob/master/CONTRIBUTING.md#sign-your-work

If you're using Android Studio to commit, you can use this checkbox in the UI once you set it up in git-config:
https://docs.github.com/en/get-started/getting-started-with-git/setting-your-username-in-git

Smarshal21 · 2023-09-29T09:24:13Z

@Smarshal21 please make sure to always sign your commits https://github.com/nextcloud/talk-android/blob/master/CONTRIBUTING.md#sign-your-work

If you're using Android Studio to commit, you can use this checkbox in the UI once you set it up in git-config: https://docs.github.com/en/get-started/getting-started-with-git/setting-your-username-in-git

Sorry for that
Certainly, I will ensure to do so from now on 👍🏻

mahibi · 2023-09-29T09:25:47Z

to fix the missing sign-offs in this branch retrospectively,
you could rebase on origin master and then squash all your commits into one commit which is signed off.
After this, you can do a force push to overwrite the origin commits.
Just let me know if you have any questions here.

Signed-off-by: Smarshal21 <[email protected]>

github-actions · 2023-10-02T09:09:54Z

Codacy

Lint

Type	master	PR
Warnings	91	91
Errors	0	0

SpotBugs

Category	Base	New
Correctness	9	9
Dodgy code	123	123
Internationalization	5	5
Malicious code vulnerability	3	3
Performance	8	8
Security	2	2
Total	150	150

github-actions · 2023-10-02T09:13:18Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/3319-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-04-02T02:03:00Z

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!

Smarshal21 requested review from AndyScherzinger and mahibi September 16, 2023 11:06

Smarshal21 mentioned this pull request Sep 16, 2023

Not possible to delete voice, video, image, contact and location messages #3111

Closed

AndyScherzinger added the 3. to review Waiting for reviews label Sep 18, 2023

AndyScherzinger added this to the 17.2.0 milestone Sep 18, 2023

Smarshal21 force-pushed the Delete_System_Messages branch from 2577140 to 4b25d14 Compare September 19, 2023 06:17

AndyScherzinger requested changes Sep 20, 2023

View reviewed changes

mahibi reviewed Sep 29, 2023

View reviewed changes

Smarshal21 force-pushed the Delete_System_Messages branch 3 times, most recently from aa63863 to 9f793c2 Compare September 29, 2023 10:01

Fixed deletion of voice, video, image, contact and location messages

b652e45

Signed-off-by: Smarshal21 <[email protected]>

mahibi force-pushed the Delete_System_Messages branch from 9f793c2 to b652e45 Compare October 2, 2023 09:02

mahibi merged commit 703f2c0 into master Oct 2, 2023
14 of 15 checks passed

delete-merged-branch bot deleted the Delete_System_Messages branch October 2, 2023 09:16

mahibi mentioned this pull request Nov 29, 2023

Delete message / sent photo file in app #3467

Closed

github-actions bot added the feedback-requested label Apr 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FIxed deletion of voice, video, image, contact and location messages #3319

FIxed deletion of voice, video, image, contact and location messages #3319

Smarshal21 commented Sep 16, 2023

Smarshal21 commented Sep 17, 2023

AndyScherzinger left a comment

mahibi commented Sep 27, 2023 •

edited

Loading

AndyScherzinger commented Sep 27, 2023

mahibi commented Sep 27, 2023

mahibi commented Sep 27, 2023 •

edited

Loading

Smarshal21 commented Sep 27, 2023

Smarshal21 commented Sep 27, 2023

mahibi Sep 29, 2023

Smarshal21 Sep 29, 2023

mahibi Sep 29, 2023

Smarshal21 Sep 29, 2023

mahibi commented Sep 29, 2023

Smarshal21 commented Sep 29, 2023

mahibi commented Sep 29, 2023

github-actions bot commented Oct 2, 2023

github-actions bot commented Oct 2, 2023

github-actions bot commented Apr 2, 2024

FIxed deletion of voice, video, image, contact and location messages #3319

FIxed deletion of voice, video, image, contact and location messages #3319

Conversation

Smarshal21 commented Sep 16, 2023

🖼️ Screenshots

🚧 TODO

🏁 Checklist

Smarshal21 commented Sep 17, 2023

AndyScherzinger left a comment

Choose a reason for hiding this comment

mahibi commented Sep 27, 2023 • edited Loading

AndyScherzinger commented Sep 27, 2023

mahibi commented Sep 27, 2023

mahibi commented Sep 27, 2023 • edited Loading

Smarshal21 commented Sep 27, 2023

Smarshal21 commented Sep 27, 2023

mahibi Sep 29, 2023

Choose a reason for hiding this comment

Smarshal21 Sep 29, 2023

Choose a reason for hiding this comment

mahibi Sep 29, 2023

Choose a reason for hiding this comment

Smarshal21 Sep 29, 2023

Choose a reason for hiding this comment

mahibi commented Sep 29, 2023

Smarshal21 commented Sep 29, 2023

mahibi commented Sep 29, 2023

github-actions bot commented Oct 2, 2023

Codacy

Lint

SpotBugs

github-actions bot commented Oct 2, 2023

github-actions bot commented Apr 2, 2024

mahibi commented Sep 27, 2023 •

edited

Loading

mahibi commented Sep 27, 2023 •

edited

Loading