Commit Graph

101 Commits

Author SHA1 Message Date
adbenitez 210e5c7fbc Merge remote-tracking branch 'upstream/main' 2025-12-10 13:32:40 +01:00
adbenitez 7837a99e7b fix ConversationActivity on Android <11 2025-12-10 12:13:46 +01:00
adbenitez e5149ac255 Merge remote-tracking branch 'upstream/main' 2025-12-08 19:16:02 +01:00
adbenitez 35becfc63b rename RelayUtil to ShareUtil 2025-12-08 12:54:42 +01:00
adbenitez 4af065aad9 Merge remote-tracking branch 'upstream/main' 2025-11-29 00:46:41 +01:00
adbenitez cd2aedcc6b ConversationActivity: properly implement edge-to-edge 2025-11-26 04:05:09 +01:00
adbenitez 7e1930abc5 Merge remote-tracking branch 'upstream/main' 2025-11-05 17:13:44 +01:00
Hocuri 2881ea7150 feat: Adapt to channel-invite QR codes 2025-11-03 22:50:19 +01:00
adbenitez 98551713ae Merge remote-tracking branch 'upstream/main' 2025-10-23 14:06:32 +02:00
adbenitez cf4cb2f839 remove duplicated ListenableFuture and SettableFuture 2025-10-10 15:38:25 +02:00
adbenitez 3aa2fbf67a Merge remote-tracking branch 'upstream/main' 2025-10-09 15:34:30 +02:00
adbenitez 4b9217e3e6 rename calls package 2025-09-30 16:29:47 +02:00
adb e388464d28 Merge branch 'adb/new-rpc-bindings' into adb/integrated-videocalls 2025-09-27 00:14:07 +02:00
adbenitez b871e42b86 use auto-generated RPC bindings 2025-09-26 23:40:26 +02:00
adbenitez ebda8c4577 hide calls button in "Saved Messages" and "Device Messages" 2025-09-24 14:23:52 +02:00
adbenitez f6ce98f9a2 remove DC_MSG_VIDEOCHAT_INVITATION 2025-09-09 16:10:42 +02:00
adbenitez 9ef01dd352 add calls button 2025-09-03 16:07:19 +02:00
adbenitez 01c766db41 remove old videochat invitations 2025-09-03 16:02:09 +02:00
adb ca27be240e Merge branch 'main' into adb/integrated-videocalls 2025-08-18 14:53:03 +02:00
adbenitez f95b48ad6a Merge remote-tracking branch 'upstream/main' 2025-08-17 19:31:59 +02:00
adbenitez 396ed14067 adapt activities to edge-to-edge 2025-08-16 02:10:02 +02:00
adbenitez a37fcfcaf7 Merge remote-tracking branch 'upstream/main' 2025-07-31 23:14:46 +02:00
adbenitez 3a3388ed59 disable non-functional disappearing timer option for email threads 2025-07-30 23:37:16 +02:00
adbenitez 2a0be883c2 Merge remote-tracking branch 'upstream/main' 2025-07-19 16:44:15 +02:00
B. Petersen 5ff8101c2c replace 'half blocked' by 'contact request' 2025-07-19 15:02:52 +02:00
B. Petersen 9e87a4b2a8 allow tapping new e2ee-info-messages; remove outdated protection-broken path 2025-07-19 15:02:52 +02:00
Hocuri 717777f628 Show channels in a proper "Channel" chat (#3783)
* Rename "broadcast list" to "channel"/"broadcast channel" both in UI and code

* feat: Add new channel types

* Update CHANGELOG.md

* adb's review

* refactor: Rename BroadcastChannel to Broadcast

* Revert accidental change

* Make it possible to leave channels

- In a chat, if the chat is an InBroadcast, and it's not a contact
  request, then the `Leave` menu option is shown with the translated
  stock string `menu_leave_channel` as its label.
- If the user clicks on it, the confirmation dialog has
  `menu_leave_channel` (rather than `menu_leave_group`) as its positive
  option.

Counterpart of https://github.com/chatmail/core/pull/6984.

---------

Co-authored-by: adbenitez <asieldbenitez@gmail.com>
Co-authored-by: adb <adb@merlinux.eu>
2025-07-10 10:32:04 +02:00
adbenitez 5af2d4fa8f Merge remote-tracking branch 'upstream/main' 2025-07-09 23:51:26 +02:00
adbenitez 8afe5739a8 Merge commit '466329995' 2025-07-08 22:13:38 +02:00
adbenitez b9520c95ed Merge branch 'main' into adb/pgp-contacts2 2025-07-08 18:08:51 +02:00
bjoern 4663299951 re-focus profile (#3792)
* duplicate ProfileActivity to AllMediaActivity

* update CHANGELOG

* remove profile stuff from AllMediaActivity

* remove media stuff from ProfileActivity

* remove TabLayout from ProfileActivity

* decouple header from viewType

* easier name editing

* add link to 'apps & media'

* move bio up

* move 'send message' up

* prepare avatar/title/subtitle

* set title

* set subtitle to member count

* add address to profile

* rename ProfileSettings* to just Profile*

* set avatar

* use avatar view

* adaptive avatar cell height

* no endless growing of online-indicator

* simplify

* handle tap on avatars

* rename Profile* to AllMedia*

* set title accordingly

* move 'last seen' up

* edit name by tapping

* Revert "edit name by tapping"

This reverts commit 6727b168302fbe50cbde803fbc83692965d3df59.

Reason is that it introduces uncertainity what happens if the name is tapped -
we do not want to nudge ppl to edit the group name in a similar way.

we may revert this revert,
but for now, let's see if the icon atop isn't sufficient.

* add media count

* space below avatar

* refactor allmedia viewtypes

* select the first tab that has content

* format footer

* remove unused headers

* space above header

* add dividers

* tweak some spacings

* tap on avatar only for enlarge/set avatar

* immediate view of first tap

* tweak value display

* add icons to buttons

* tweak paddings

* no address for self-talk and device-chat

* use signature background for less cluttered UI

* avoid global state modification and showing eg. app-icon tinted also elsewhere

* tweak sizes

* move introduced-by/server down. these information become less important the more chats you have with the contact - and otherwise just clutter UI

* update CHANGELOG

* typo

* use more normal font and spacing for footer

* open "media" deterministically

remove the smart forwarding to "tab with content",
which results in unclear behaviour.

also, we want to push for apps,
which is also the thing that really changes.
when searching for an image, another tap is fine.
2025-07-05 11:16:30 +02:00
adbenitez 825ee6a79e don't allow to leave email threads 2025-06-25 14:45:05 +02:00
adbenitez 3086c72304 undo temporary test 2025-06-19 17:17:53 +02:00
adbenitez edeec415a1 Merge remote-tracking branch 'upstream/main' 2025-05-27 16:05:23 +02:00
adbenitez 47350b1809 show action button to see the list of apps sent in chat 2025-05-23 14:26:34 +02:00
adbenitez fe602004c7 Merge remote-tracking branch 'upstream/main' 2025-04-02 17:18:16 +02:00
bjoern e2d7f2c3d3 prefer NAME over NAME (ADDR) (#3699)
* prefer NAME over NAME (ADDR)

this tunes the usage of email addresses further down,
in all cases, the profile should only be a tap away before or afterwards,
so, these mentionings were never really critical

* update CHANGELOG

* Update CHANGELOG.md

Co-authored-by: adb <adb@merlinux.eu>

---------

Co-authored-by: adb <adb@merlinux.eu>
2025-04-02 16:41:36 +02:00
adbenitez 74c02932c3 Merge remote-tracking branch 'upstream/main' 2025-03-13 18:24:28 +01:00
adbenitez 1663502d35 avoid NPE in processComposeControls 2025-03-12 16:16:34 +01:00
adbenitez 3e9c977b3f Merge remote-tracking branch 'upstream/main' 2025-03-11 22:16:52 +01:00
adbenitez 11addb6522 check if activity is finishing before creating "one moment" dialog 2025-03-11 20:40:30 +01:00
adbenitez 129278443d Merge remote-tracking branch 'upstream/main' 2025-03-10 23:45:08 +01:00
adbenitez cca9dfb04a avoid ANR in ConversationActivity.processComposeControls 2025-03-10 22:17:47 +01:00
B. Petersen 906db9155a bring back 'add attachment later', which was removed at #3601 2025-03-08 20:41:11 +01:00
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