fix: Use getFilename() instead of the actual filename on disk #3521
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment was marked as outdated.
This comment was marked as outdated.
Hocuri
changed the title
This comment was marked as outdated.
This comment was marked as outdated.
…as always null" We will unfortunately need getManuallyCalculatedSlideInfo() with `msg` param This reverts commit 60e8248.
This fixes a bug introduced in 14f69f8: When you drafted an image, pressed Back, and opened the chat again, then the height of the drafted image was wrong and tapping the image opened a preview for the wrong image. I do think that theoretically it would be nicer to use getSlideForMsg here, because we already have a DcMsg, but this didn't work because a) the width and height wasn't gotten from the msg and instead 0 was passed and b) the code tries to save a msgId instead of the message instead, and loading the message from the database fails later since it's just a draft. I didn't want to try and fix these things, because they might be bigger refactorings and I don't know the code.
Hocuri
changed the title
This comment was marked as outdated.
This comment was marked as outdated.
Hocuri
commented
Jan 7, 2025
| DcHelper.sharedFiles.put("/" + pngImage, 1); | ||
| DcHelper.sharedFiles.put(pngImage, 1); |
There was a problem hiding this comment.
For explanation: Since AttachmentsContentProvider.openFile() (which checks sharedFiles) now uses getPathSegments().get(0); instead of getPath();, the leading / won't be included there. So, it's easier for AttachmentsContentProvider.openFile() to have it without the leading /.
|
To test the changes in this pull request, install this apk: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In preparation for deltachat/deltachat-core-rust#6332, use the original name of the file (as returned by getFilename()) instead of the current filename on disk.
Most of the commits are cherry-picked from #3513.
What I did:
Known bugs:
The height isn't correctly for image and video drafts calculated becausegetManuallyCalculatedSlideInfo()isn't called, so that DcAttachment gets width and height 0When tapping the preview of a draft image, a wrong image is shown