Commit Graph

57 Commits

Author SHA1 Message Date
adbenitez dfed8aec00 Merge remote-tracking branch 'upstream/main' 2025-02-27 18:53:58 +01:00
adbenitez 6621046d6d cancel editing when user swipe-to-reply a message 2025-02-27 17:41:53 +01:00
adbenitez ed23c93526 fix: don't discard draft if not in editing mode 2025-02-27 17:41:53 +01:00
adbenitez 19cd640dc8 tweak code style 2025-02-27 17:41:53 +01:00
adbenitez fce62453d1 show "Edit Message" instead of "Me" in edition mode 2025-02-27 17:41:53 +01:00
adbenitez d1737cb69f allow to edit outgoing text messages 2025-02-27 17:41:51 +01:00
adbenitez 9cc4422f9e Merge remote-tracking branch 'upstream/main' 2025-02-26 19:54:22 +01:00
adbenitez 3dc216ca7f fix warning about non-final resource IDs 2025-02-25 17:46:09 +01:00
adbenitez 5ce1f415ce remove deprecated half-camera dependency 2025-02-04 18:40:02 +01:00
adbenitez 20180fa89c Merge remote-tracking branch 'upstream/main' 2025-01-27 22:06:04 +01:00
Hocuri c6b89055d8 File deduplication, Android part (#3513) 2025-01-27 18:40:44 +01:00
adbenitez ee17c6d75e Merge remote-tracking branch 'upstream/main' 2025-01-16 21:10:25 +01:00
adbenitez e9d2a39098 avoid null in attachment filename 2025-01-16 20:03:43 +01:00
Hocuri 8e55a3dbf3 fix: Use getFilename() instead of the actual filename on disk (#3521)
* fix: Use msg.getFilename() instead of the file's name in some cases

* fix: Use msg.getFilename() instead of the file's name in initializeDraft()

* fix: Use msg.getFilename() instead of the file's name in MediaItem

* fix: Use the correct file name in MediaView

* refactor: `msg` param of `getManuallyCalculatedSlideInfo()` was always null

* Improve comment

* Revert "refactor: `msg` param of `getManuallyCalculatedSlideInfo()` was always null"

We will unfortunately need getManuallyCalculatedSlideInfo() with `msg`
param

This reverts commit 60e8248db32dc22812d3f23da194bab644802045.

* fix: Fix drafting images

This fixes a bug introduced in 14f69f87e8b11a7d0568e58593946a1f1c01e75e:
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.

* fix: Use the original message's filemime if there is one

...instead of trying to guess the mimetype from the uri
2025-01-15 16:40:23 +01:00
adbenitez 009593f7cc remove dead code 2025-01-04 16:06:40 +01:00
adbenitez 5b6024584a force sending sticker 2024-12-20 17:47:45 +01:00
adbenitez 2a2ce883b4 Merge remote-tracking branch 'upstream/main' 2024-12-18 19:33:04 +01:00
adb 37886cf296 Merge pull request #3506 from deltachat/adb/issue-3502
run SendRelayedMessageUtil.sendMultipleMsgs() in background
2024-12-18 17:19:34 +01:00
adbenitez df5ba2eced call SendRelayedMessageUtil.sendMultipleMsgs() in background 2024-12-18 17:17:46 +01:00
adb 7f684f4d2e Merge pull request #3499 from deltachat/adb/issue-3498
avoid IllegalArgumentException dismissing dialog
2024-12-17 17:07:03 +01:00
adbenitez 6916becf7f avoid IllegalArgumentException dismissing dialog 2024-12-17 16:13:37 +01:00
adbenitez 3113f9c3ab optimize onConfigurationChanged() 2024-12-16 17:19:34 +01:00
adbenitez a1e47865c5 improve emoji pickers 2024-12-16 15:27:13 +01:00
adbenitez 5ffbc19d03 Merge remote-tracking branch 'upstream/main' 2024-12-13 22:42:20 +01:00
Hocuri 963327dd64 Remove prepareMsg (and OUT_PREPARING message state) (#3468)
This PR removes prepareMsg, which put messages into the OUT_PREPARING state and was used while videos were recoded. It also removes the now-unused method isIncreation().
- It was buggy because when you forwarded a message while it was InPreparation, or when the app was killed while a message is InPreparation, the message would stay InPreparation forever.
- Android is the only UI using this InPreparation (according to @r10s, I didn't check this myself), so we can simplify some things in core, which will also make it easier to deduplicate blob files.
2024-12-11 13:53:36 +01:00
adbenitez e045a09d36 Merge remote-tracking branch 'upstream/main' 2024-12-07 17:10:18 +01:00
adbenitez 0a73877c25 add app picker to attachments menu 2024-12-03 18:52:15 +01:00
adbenitez 819a9f415a Merge remote-tracking branch 'upstream/main' 2024-11-29 19:38:43 +01:00
adbenitez 0ca92ec6b5 remove android 4 compatibility code 2024-11-21 01:16:20 +01:00
link2xt 9a4851961e fix: check draft.isOk() instead of comparing to null
dcContext.getDraft() never returns null.
2024-11-19 10:38:08 +00:00
adbenitez ccdad0469d Merge remote-tracking branch 'upstream/main' 2024-11-13 01:45:40 +01:00
adbenitez 3fae301ec2 remove old emojis components 2024-11-05 02:00:42 +01:00
adbenitez 12ad3daa28 Merge remote-tracking branch 'upstream/main' 2024-10-22 02:13:13 +02:00
B. Petersen 86a9da5062 better confirmation message 2024-10-14 15:58:23 +02:00
B. Petersen d3328df6f2 rename the function to what it does: sending multiple messages 2024-10-14 15:58:23 +02:00
B. Petersen 139b7f84f4 basic handling of multiple selected files 2024-10-14 15:58:23 +02:00
B. Petersen 3d55ea931c move asking-for-sending to a separate function 2024-10-14 15:58:23 +02:00
adbenitez 1787dc4c8b Merge remote-tracking branch 'upstream/main' 2024-10-10 20:40:06 +02:00
B. Petersen 5f77f791d0 fix the warning when attaching multiple files: images are recoded, only videos are not 2024-10-10 16:47:02 +02:00
adbenitez 9d4b5e8fed Merge remote-tracking branch 'upstream/main' 2024-09-19 23:26:46 +02:00
adbenitez f3fa1d5e7c revert hack introduced in #2835 2024-09-17 19:16:39 +02:00
adbenitez 4a02d6c73d remove hack to send single emoji as reaction 2024-08-31 01:41:44 +02:00
adbenitez 589d1c3569 Merge remote-tracking branch 'upstream/main' 2024-08-25 21:15:09 +02:00
B. Petersen f1755b399b stop using locale from PreferenceManager 2024-08-16 23:11:50 +02:00
adbenitez edbb1b1b82 Merge remote-tracking branch 'upstream/main' 2024-08-14 17:18:14 +02:00
B. Petersen 36a480fec8 tint destructive buttons in red 2024-08-09 18:40:38 +02:00
B. Petersen c24a070d99 make use of ask_delete_named_chat in case only one chat is about being deleted 2024-08-09 18:24:25 +02:00
adbenitez bab62405fd Merge remote-tracking branch 'upstream/main' 2024-08-07 14:02:37 +02:00
B. Petersen 7865940595 keep selected audio's staged as preview (by keeping DC_MSG_AUDIO viewtype) 2024-08-05 16:31:47 +02:00
B. Petersen 17a0f539c6 remove more dead code 2024-08-05 16:31:47 +02:00