thedevstack/PiratX
3
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 24 Pull requests 1 Wiki Activity Actions 1

update fork #100

Open
thedevstack-bot wants to merge 28 commits from mirror/monocles_chat_clean:master into master
pull from: mirror/monocles_chat_clean:master
merge into: thedevstack:master
Conversation 0 Commits 28 Files changed 35 +615 -146
thedevstack-bot commented 2025-08-30 07:01:43 +02:00
Member
Copy link
No description provided. 
This commit refactors the message retraction and moderation functionality.

- Added `retractId` field to `Message` entity and database schema.
- Updated `ConversationFragment` to handle new message retraction logic:
    - Set `deleted` flag on message.
    - Clear sensitive fields like body, file path, and payloads.
    - Send a retraction message to the server if the original message was sent.
    - Update the UI to reflect the retracted message.
- Modified `MessageParser` to handle incoming retraction/moderation messages:
    - Find the original message by `replacementId`.
    - Verify authorization to retract/moderate.
    - Update the original message's body to indicate retraction/moderation.
    - Clear sensitive fields and delete associated files.
    - Update the message in the database and UI.
- Adjusted `MessageGenerator` to include retraction information in outgoing messages when `isDeleted` is true.
- Added new string resources for retracted messages.
Can't use from when the message is from us...

(cherry picked from commit 95ec711b31ac87a1fc4c753cb546e54c5ba93c5f)
Add columnExists method and use it to check for RETRACT_ID column
Some checks failed
Android CI / build (pull_request) Has been cancelled
Details
b697f99567 
fix message retraction of edited messages
Temporary style reply and info bubbles to look like other bubbles
Some checks failed
Android CI / build (pull_request) Has been cancelled
Details
edf9f47ba1
Add preference for custom client resource name
Some checks failed
Android CI / build (pull_request) Has been cancelled
Details
16a70dd838
Prepare release 2.0.14
Some checks failed
Android CI / build (pull_request) Has been cancelled
Details
1a54faed7a 
This reverts commit c198f4e35c.
(cherry picked from commit 938cd3b9e9562a0560744b2796de424c84de9988)
Prevent crash if username view is missing
Some checks are pending
Android CI / build (pull_request) Waiting to run
Details
6f04c3a23d
Some checks are pending
Android CI / build (pull_request) Waiting to run
Details
This pull request has changes conflicting with the target branch.
  • src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
  • src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u master:mirror-master
git switch mirror-master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
update fork
No labels
update fork
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: thedevstack/PiratX#100
No description provided.
Delete branch "mirror/monocles_chat_clean:master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?