Commit graph

716 commits

Author SHA1 Message Date
Benoit Marty
b9b746bea7 Attempt to fix test on CI.
The test is failing on CI with this error:
expected instance of: io.element.android.libraries.architecture.Async$Success
but was instance of : io.element.android.libraries.architecture.Async$Loading
with value          : Loading(prevData=null)
2023-12-26 08:32:18 +01:00
Jorge Martín
c5c920cfa6 Revert "Merge pull request #2071 from element-hq/feature/bma/fixTests"
This reverts commit 19edf067fa, reversing
changes made to fb766f5176.
2023-12-22 12:01:42 +01:00
Jorge Martin Espinosa
cbf34929af
Revert "Room list badges" 2023-12-22 11:02:07 +01:00
Benoit Marty
3bb27a662a
Merge pull request #2080 from element-hq/feature/bma/roomListBadges
Room list badges
2023-12-21 16:44:10 +01:00
Benoit Marty
91027f82e9 Fix test. 2023-12-21 16:11:03 +01:00
Benoit Marty
7273abd42b
Merge pull request #2041 from element-hq/feature/fga/fix_timeline_back_pagination_loop
Fix timeline back pagination loop in encrypted room.
2023-12-21 15:42:23 +01:00
Benoit Marty
f2c989cbd6 Iterate on indicators on room list #2079 2023-12-21 14:51:31 +01:00
Benoit Marty
f94f5e4713 Second attempt... 2023-12-20 14:33:16 +01:00
Benoit Marty
ee766ecf26 Providing a thumbnail when sending a media is now optional. 2023-12-19 10:41:44 +01:00
ganfra
d641ef29ce Tests: replace "0" by FAKE_UNIQUE_ID when its ok. 2023-12-18 18:19:32 +01:00
Benoit Marty
1b0a4093d9 Fix test which was passing for wrong reason. 2023-12-15 20:07:11 +01:00
ganfra
c0ac6e191b Timeline : makes sure pagination state is computed correctly and only in one place. 2023-12-15 15:02:46 +01:00
ganfra
f961d81eb0 Timeline : uniqueId exposed as String directly from matrix module. 2023-12-15 14:48:49 +01:00
Benoit Marty
949d57bd41 Fix compilation issue after merging develop 2023-12-14 17:36:35 +01:00
Benoit Marty
8f286c8ce6
Merge branch 'develop' into julioromano/poll_history_entry_point 2023-12-14 17:34:49 +01:00
Jorge Martin Espinosa
d27e9e5265
Add warning message to 'mentions and keywords only' notification option (#2028)
* Add warning message to 'mentions and keywords only'

 It should be displayed when it's not supported by the homeserver

* Only display disclaimer in the room notification settings if the room is encrypted

Co-authored-by: Benoit Marty <benoit@matrix.org>

* Fix test and add another one

---------

Co-authored-by: ElementBot <benoitm+elementbot@element.io>
Co-authored-by: Benoit Marty <benoit@matrix.org>
2023-12-14 16:15:39 +00:00
Benoit Marty
664e8b6d5b
Merge branch 'develop' into julioromano/poll_history_entry_point 2023-12-14 16:58:23 +01:00
ganfra
ac7dd355aa Fix test compilation again. 2023-12-14 16:08:22 +01:00
Benoit Marty
e725747ea3
Merge pull request #2015 from element-hq/feature/bma/asyncMedia
ReadReceipt
2023-12-14 16:03:09 +01:00
ganfra
5ac3f273ea Merge branch 'develop' into julioromano/poll_history_entry_point 2023-12-14 15:17:13 +01:00
Benoit Marty
ea0825a01c Create RoomMember.getBestName() extension. 2023-12-14 15:10:49 +01:00
ganfra
bb7123afbd Fix tests and warnings 2023-12-14 13:13:11 +01:00
Jorge Martin Espinosa
2492584786
Handle tapping on user mentions (#2021) 2023-12-14 11:56:59 +00:00
ganfra
5d37c66caf
Merge pull request #1897 from element-hq/jonny/timeline-poll-edited
Display edited indicator for polls in the timeline
2023-12-14 08:13:11 +01:00
Benoit Marty
36ccc1ccbd Fix API break regarding ReceiptType 2023-12-13 18:02:06 +01:00
ganfra
863d156e4d Merge branch 'develop' into julioromano/poll_history_entry_point 2023-12-13 17:22:55 +01:00
ganfra
6378f6cffe Poll history : add tests and fix others 2023-12-13 16:20:01 +01:00
Benoit Marty
6e6930c076 Consider that the state is Done when the state is Uploading with backedUpCount == totalCount #2008 2023-12-13 15:46:42 +01:00
ganfra
e76bafc043 Timeline : avoid crash when destroying 2023-12-12 15:36:27 +01:00
Benoit Marty
764d7685c2 Remove useless constructor keyword. 2023-12-12 15:29:44 +01:00
ganfra
449c331879 Timeline: exposes simple request for backward pagination 2023-12-12 14:23:50 +01:00
Benoit Marty
0a16af1d4f
Merge pull request #1965 from vector-im/feature/bma/emojiRepresentation
Fix emoji representation
2023-12-11 17:51:58 +01:00
Benoit Marty
e56cc137ed Rename file. 2023-12-11 15:58:47 +01:00
Benoit Marty
419a162f77 Extract MxcTools and add test. 2023-12-11 14:53:02 +01:00
Benoit Marty
84c897d682 Image in notification 2023-12-11 14:52:50 +01:00
renovate[bot]
271fedb7d4
Update dependency net.java.dev.jna:jna to v5.14.0 (#1986)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-11 09:59:09 +01:00
Benoit Marty
cdec7048ac Update test. 2023-12-08 16:52:12 +01:00
Benoit Marty
7a46aa8ec3 kotlin compiler 2023-12-08 16:42:26 +01:00
Benoit Marty
5001a6fbe1 Update regarding SDK change on verification data 2023-12-08 16:41:56 +01:00
ganfra
aa9693126f PollHistory : simplify so we only have one Node. Also enrich PollHistoryState. 2023-12-06 19:27:50 +01:00
Benoit Marty
10d5268d0f SAS emoji: use embedded drawable (#1953) 2023-12-06 14:10:05 +01:00
Benoit Marty
274bc89e11
Merge pull request #1961 from vector-im/feature/bma/keyBackupIteration
Key backup iteration
2023-12-06 11:18:50 +01:00
Benoit Marty
c9ba607edf Map new CALL_MEMBER state, and fix issue on fun canUserJoinCall(). 2023-12-06 10:40:59 +01:00
Benoit Marty
9ee339aafb Map RecoveryException 2023-12-05 18:11:33 +01:00
Benoit Marty
e8e2e95e02 Follow SDK method renaming: fix_recovery_issues() got renamed to recover() 2023-12-05 17:40:47 +01:00
ganfra
4a2cbb1ed4 Polls: share logic around PollContent 2023-12-05 14:06:59 +01:00
Benoit Marty
f44a4a3a31 Fix AlsoCouldBeApply issue. 2023-12-04 18:07:04 +01:00
Benoit Marty
66ac1e271f Add notification setting to enable/disable being notified for room invite (#1944) 2023-12-04 17:50:21 +01:00
Benoit Marty
1779e53e93 Let RustNotificationSettingsService handle the lifecycle of notificationSettings, and call setDelegate(null) 2023-12-04 17:50:21 +01:00
Benoit Marty
f6ec76b5ef
Merge branch 'develop' into jonny/timeline-poll-edited 2023-12-04 16:01:09 +01:00