filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,807 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

6295 Commits

Author SHA1 Message Date
valere 8f1bbd6ff0 revert as kotlin crypto specific test 2023-03-29 10:00:08 +02:00
valere bcc1ac4ac9 rust-crypto 0.3.1 , wa to fix compilation 2023-03-28 23:33:23 +02:00
valere 927f7757cd Merge branch 'develop' into feature/bca/rust_flavor 2023-03-28 17:17:35 +02:00
SpiritCroc 1004bd19e3 [TEST] Don't set main_or_null read receipt to old events 
Context:
https://github.com/SchildiChat/SchildiChat-android-rageshakes/issues/951

If main RR updates after null RR, but to an older event than the null
RR, we still want to keep the null one.

Change-Id: Ib865965b6975536421b15146c863b9ea46f793b0
 2023-03-25 08:32:22 +01:00
Yoan Pintas 9fd1a22e10
Pillify permalinks (#8242) 2023-03-21 21:31:45 +00:00
valere 065ee1d2f5 cleaning 2023-03-14 12:07:39 +01:00
valere 5f069264d0 Ignore some test in tust. Added some supports flags 2023-03-14 09:57:58 +01:00
valere 238d10d4cb Test integration of rust shield states 2023-03-10 10:30:37 +01:00
valere 5f185c51e7 Merge branch 'develop' into feature/bca/rust_flavor 2023-03-09 18:21:41 +01:00
SpiritCroc 80edce3d6c Escape @room in reply fallback to avoid unintentional pings 
Closes https://github.com/SchildiChat/SchildiChat-android/issues/178

Change-Id: I8a545dd80d29802d1b35b0315fca89125c997f15
 2023-03-09 10:54:03 +01:00
SpiritCroc 19881a9f70 Merge tag 'v1.5.28' into sc 
Change-Id: Ic5e1c79d3c39476375bf795bb7a1abb67c664f94

Conflicts:
	dependencies.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
	vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml
 2023-03-08 20:27:57 +01:00
Florian Renaud 39c702f41b
Merge pull request #8170 from vector-im/feature/fre/apply_push_rules_after_decryption 
Reapply push rules on the decrypted event source (PSG-1146)
 2023-03-07 10:39:48 +01:00
Yoan Pintas 94675b9f85
create encrypted DM for user invite by email (#8172) 
Co-authored-by: jonnyandrew <jonny.andrew@protonmail.com>
 2023-03-06 22:05:43 +00:00
SpiritCroc e4e4e0a388 Support rendering emote pack display name 
Change-Id: I93b422f3931128dd75de8ee570c56976a93702c8
 2023-03-06 11:28:05 +01:00
Florian Renaud 21c7fc3d0a Merge remote-tracking branch 'origin/develop' into feature/fre/apply_push_rules_after_decryption 2023-03-06 09:11:48 +01:00
Benoit Marty ceda85f624 Fix test by mocking `WorkManagerProvider.tag` 
Appeared when upgrading androidx.work:work-runtime-ktx from 2.7.1 to 2.8.0 in #8099
 2023-03-03 18:01:10 +01:00
Yoan Pintas 446ed24bea
Update room member shields behavior (#8195) 2023-03-03 09:28:50 +00:00
Florian Renaud 4146b5511a Merge develop into feature/fre/apply_push_rules_after_decryption 2023-03-02 15:03:22 +01:00
Florian Renaud 084bd44348 Update decryption result on the events from the sync response 
As the decryption is done on a copy of the event (containing the roomId), we have to update the initial event with the decryption result
 2023-03-02 14:40:31 +01:00
Benoit Marty c7928c2228
Merge pull request #8168 from SpiritCroc/chunk-roomids 
matrix-sdk: Ensure correct room for events loaded by chunks
 2023-03-02 13:57:59 +01:00
Florian Renaud 245ca13049 Improve encryption check condition 2023-03-01 13:52:53 +01:00
Florian Renaud 891897f0a7 Add additional tests 2023-03-01 13:50:40 +01:00
Florian Renaud 75559fb21a Ensure the event is decrypted before applying push rules 2023-03-01 11:49:43 +01:00
Florian Renaud ccf971afc4 Update encrypted raw json with decrypted event content for event matching condition 2023-03-01 10:42:57 +01:00
Florian Renaud 9d7758c9e3 Reuse event.supportsNotification extension 2023-02-24 09:26:50 +01:00
Florian Renaud b6ac915805 Apply push rules on encrypted events 2023-02-24 09:13:44 +01:00
SpiritCroc 8192bb5442 matrix-sdk: Ensure correct room for events loaded by chunks 
Chunks should not load events from other rooms if they happen to be
requested for one eventId that already exists in a different room.

Motivation from a client that renders rich replies (although the
broken scenario can appear in other cases as well):

If somebody links an invalid eventId in a room, which however is valid
in a different room, this can mess up our timelines badly.
This can be reproduced by replying to an event in a room, then forward
the reply to a different room with a client that also forwards the
replied-to information (such as FluffyChat). Then click on the rich
reply to open the eventId. Previously, Android could find the event from
the other room and thus replace the correct timeline with the wrong one.

Compare e.g. https://matrix.to/#/!bfebJVBOZMnORmkVdO:matrix.org/$wUyRiMQEjaWOpJ-XpdBJzuXkh95N7bce2pVT4IMXW50?via=schildi.chat&via=matrix.org&via=envs.net
linking to an event that exists here
https://matrix.to/#/!SDwMepdfgrmExhyxYZ:schildi.chat/$MO2G4MZZ1zg0Ymc9gTfekIyw7QFkNn4OvYQKK1PAGlE

Change-Id: I4dcee94353d954fb6ed57c3970686a620b831c6f
 2023-02-23 20:12:33 +01:00
SpiritCroc 84684f24ea permalink loadMore: do not endlessly retry on M_UNKNOWN error 
Currently getting this after
"[rich replies] matrix-sdk: Ensure correct room for events loaded by
chunks"

Change-Id: I6658a9ed9e5df6d1cca580f2e83fff4a86d3383a
 2023-02-23 20:00:03 +01:00
SpiritCroc af720cdab9 [rich replies] matrix-sdk: Ensure correct room for events loaded by chunks 
If somebody links an invalid eventId in a room, which however is valid
in a different room, this can mess up our timelines badly.
This can be reproduced by replying to an event in a room, then forward
the reply to a different room with a client that also forwards the
replied-to information (such as FluffyChat). Then click on the rich
reply to open the eventId. Previously, Android could find the event from
the other room and thus replace the correct timeline with the wrong one.

Compare e.g. https://matrix.to/#/!bfebJVBOZMnORmkVdO:matrix.org/$wUyRiMQEjaWOpJ-XpdBJzuXkh95N7bce2pVT4IMXW50?via=schildi.chat&via=matrix.org&via=envs.net
linking to an event that exists here
https://matrix.to/#/!SDwMepdfgrmExhyxYZ:schildi.chat/$MO2G4MZZ1zg0Ymc9gTfekIyw7QFkNn4OvYQKK1PAGlE

Change-Id: I4dcee94353d954fb6ed57c3970686a620b831c6f
 2023-02-23 19:48:15 +01:00
valere 1e66f4fa49 Fix broken migration 2023-02-23 14:57:28 +01:00
SpiritCroc 4065d21b7e [merge] Disable another new useless reply fallback calculation 
Change-Id: Ia090dac36ce08e7ea8e8bc0fe67a3e316b988bb9
 2023-02-23 12:12:46 +01:00
SpiritCroc 38c8e30541 Merge tag 'v1.5.26' into sc 
Change-Id: Ie54ce4c15b4b95f7ecb4419f421762d7c57c5c2d

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/res/drawable/ic_composer_rich_text_editor_close.xml
	vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml
	vector/src/main/res/drawable/ic_rich_composer_add.xml
	vector/src/main/res/drawable/ic_rich_composer_send.xml
 2023-02-23 11:55:21 +01:00
Florian Renaud 021babc9b1 Fix notification in encrypted room for poll end event 2023-02-23 09:24:14 +01:00
Maxime NATUREL ac0bdb7dfe Ensure edited text reply contains a formatted body 2023-02-20 15:55:49 +01:00
SpiritCroc 9521814f32 Support webp rendering in the timeline 
Change-Id: I701cc96bdc466e1de961222e30d25289a159557e
 2023-02-19 10:10:42 +01:00
Maxime NATUREL de50577ac3
Merge pull request #8136 from vector-im/fix/mna/poll-end-while-no-poll-start 
[Poll] Improve rendering of poll end message when poll start event isn't available (PSG-1157)
 2023-02-17 13:51:50 +01:00
Florian Renaud 7d16c86f37
Merge pull request #8130 from vector-im/feature/fre/poll_sync_push_rules_after_creation 
[Poll] Synchronize polls and message push rules after creation (PSG-1137)
 2023-02-17 13:46:13 +01:00
Florian Renaud dcd43d6e7f Move push rule ids extensions to vector module 2023-02-17 10:14:33 +01:00
Florian Renaud f887acd854
Merge pull request #8114 from vector-im/feature/fre/poll_new_push_rules 
[Poll] Synchronize polls push rules with message push rules (PSG-954)
 2023-02-17 10:03:53 +01:00
Maxime NATUREL 2ae6cd40c7
Merge pull request #8126 from vector-im/fix/mna/poll-votes-aggregation 
[Poll] Fix votes aggregation process (PSG-1153)
 2023-02-16 17:29:45 +01:00
Maxime NATUREL 068a43e1f4 Fix code style issue 2023-02-15 10:37:10 +01:00
Hugh Nimmo-Smith e8f196a6f1 Deduplicate error messages 2023-02-14 17:53:02 +00:00
Florian Renaud 1f4c098d8b Synchronize polls and message push rules after creation 2023-02-14 17:56:30 +01:00
Florian Renaud 2cb1ea95dc Allow notifications for poll end event 2023-02-14 17:52:23 +01:00
Florian Renaud 71455706cb Sync poll rules with messages rule 2023-02-14 17:52:22 +01:00
Maxime NATUREL 28089618a3 Adding fallback text on Poll end message 2023-02-14 17:01:57 +01:00
SpiritCroc b65bd730b8 Add some missed read receipt debugging 
Change-Id: I431f18d433b49e382b70bc14dc999ca14e8f05f3
 2023-02-14 10:49:18 +01:00
Hugh Nimmo-Smith f43c9bf4d0
Spelling 2023-02-13 17:40:50 +00:00
Maxime NATUREL 6034085244 Adding unit test 2023-02-13 18:08:08 +01:00
Maxime NATUREL 454ce1c095 Aggregate poll response events even when the poll start event has been received yet 2023-02-13 18:08:07 +01:00
Hugh Nimmo-Smith 3a40223bf7 Lint 2023-02-13 16:34:56 +00:00
Hugh Nimmo-Smith 2db75e2a62 Support for v2 of MSC3903 
Improves the feedback in case of valid code but of unsupported algorithm or transport.
Added some test cases.
 2023-02-13 15:07:44 +00:00
SpiritCroc 98b98c069d [merge] Fix room summary preview mismerge 
Change-Id: I7a1511fc0c6adc1a98cea4a0517835efae83e069
 2023-02-11 08:36:41 +01:00
SpiritCroc a48ce4b18c [TESTING] Fight duplicate read markers in main timeline, pt.2 
- Make my read-marker experiments backwards-compatible, by introducing a
  new artificial marker
- Fix sometimes the marker going missing, by not deduplicating read
  markers, then filtering out the other one because duplicates didn't
  respect the thread id
Needs an initial sync to fully apply.

Change-Id: Id02ae19d03077016cbeb8d9a8fd5130d77931b2d
 2023-02-10 16:04:26 +01:00
Hugh Nimmo-Smith b1d7831684 Session migration 51 2023-02-09 09:57:07 +00:00
Hugh Nimmo-Smith 10a1ea033b Merge branch 'develop' into hughns/msc3824-oidc-aware 2023-02-09 09:53:26 +00:00
SpiritCroc 51274af2fe Merge tag 'v1.5.24' into sc 
Change-Id: I3eda119f38061c31595d9087f6067b269b87d8d1

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
 2023-02-08 13:08:42 +01:00
valere 2232839cd5 fix test having timeouts 2023-02-08 09:38:48 +01:00
Benoit Marty 0971a28532
Merge pull request #8057 from vector-im/yostyle/vb_utd 
Let the user know when we are not able to decrypt the voice broadcast…
 2023-02-07 18:16:34 +01:00
yostyle 8775c4d0a2 Fix lint 2023-02-07 16:54:24 +01:00
Benoit Marty 4226296990 Get Event from cache without using a `Room` 2023-02-07 14:52:12 +01:00
valere 6064cfd5c1 Fix tests 2023-02-07 12:58:31 +01:00
valere a70e3c2533 Merge branch 'develop' into feature/bca/rust_flavor 2023-02-07 11:36:11 +01:00
SpiritCroc cd9a3b9be2 [TEST] Fight duplicate read markers in main timeline 
Let synced null and main markers both update the main marker.
Looks like desktop does the same:
7158a99a1c/src/sync-accumulator.ts (L459-L460)

Change-Id: Ic4bf8b4d947fdd9882a3da053ac2b93747f1f20a
 2023-02-07 09:30:27 +01:00
valere 8b28e7ba54 quick cleaning 2023-02-06 11:44:39 +01:00
valere 318a5a8fc1 Fix test compilation 2023-02-06 11:44:14 +01:00
valere b48e6f5d71 Merge branch 'develop' into feature/bca/rust_flavor 2023-02-06 10:29:00 +01:00
valere eea3dac20d fix danger 2023-02-06 10:25:53 +01:00
valere fdd7023dd5 fix CI warning 2023-02-06 10:04:27 +01:00
Florian Renaud e1086669c7 Merge remote-tracking branch 'origin/develop' into fix-at-room 2023-02-06 09:36:00 +01:00
valere c0fb4e88cd quality 2023-02-06 09:24:56 +01:00
valere 604c3932cd Flow collector causing strange NPE in some occasions 2023-02-03 15:38:16 +01:00
valere 32aaf57ecf missing transiant field in copyAll 2023-02-03 13:42:23 +01:00
valere 76f856b2ea fix maybeBackup called for nothing 2023-02-03 13:42:07 +01:00
valere e53fbaa11d Fix false positive empty roomlist 2023-02-03 11:50:17 +01:00
valere 6f859c9ca6 Fix disable MSC3061 lab for rust crypto 2023-02-03 10:59:47 +01:00
valere 2f1e282950 Add some timing logs for encryption 2023-02-03 10:15:40 +01:00
valere 704e14c6a4 Fix QR code signaling 2023-02-03 00:10:05 +01:00
valere 508092e0a3 fix crash on logout 2023-02-02 16:25:04 +01:00
valere 9d75a66aea Mark verification state as dirty 
to avoid false positive decrypted by deleted session
 2023-02-02 16:23:56 +01:00
valere ebed3195bf fix new error reported from rust side 2023-02-02 16:15:53 +01:00
Maxime NATUREL ebd35bdd88
Merge pull request #7969 from vector-im/feature/ons/fix_poll_end_reply 
Show poll question when rendering reply to a poll end event (PSG-1133)
 2023-02-01 11:22:39 +01:00
Maxime NATUREL 48393ee5d1 Fixing some previews for end poll events 2023-02-01 10:17:38 +01:00
Maxime NATUREL 8fb38f57dc Fallback to message content of end message if no event found for start message 2023-01-31 17:15:26 +01:00
Maxime NATUREL 7a95ece738 Fix body of edited reply 2023-01-31 17:13:36 +01:00
valere 4dee5d2366 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-30 16:46:54 +01:00
valere b1a3fb393d Fix flavor compilation 2023-01-30 15:25:27 +01:00
valere 51b960361b rust fallback key support + stable ids 2023-01-30 15:24:56 +01:00
valere c4e03c59a0 refactor home room list 2023-01-30 09:45:03 +01:00
valere 992ec7f3f4 cleaning 2023-01-29 21:06:35 +01:00
valere 8593f2330f Better Ram mgmt and offload from main 2023-01-27 17:25:20 +01:00
valere 2a5768dd60 Encrypt rust database 2023-01-27 14:05:16 +01:00
Hugh Nimmo-Smith b1cacb37f9 Actually configure migration 50 to be used 2023-01-27 12:19:40 +00:00
SpiritCroc d8bd92c413 Merge tag 'v1.5.22' into sc 
Change-Id: I3e8db4d0d0d6afa0f47c9daa0f809410938674e0

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCase.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
 2023-01-26 19:49:36 +01:00
Maxime NATUREL 3ab465ea93
Merge pull request #8003 from vector-im/feature/mna/fetch-poll-history-timeline 
[Poll] Unmock poll history timeline (PSG-1045, PSG-1095)
 2023-01-26 17:18:56 +01:00
Maxime NATUREL b6f77ac578 Adding unit tests for LoadMorePollsTask 2023-01-26 15:56:28 +01:00
Maxime NATUREL 4182581235 Adding unit tests for SyncPollsTask 2023-01-26 14:51:16 +01:00
Maxime NATUREL 3045a8581a Adding unit tests for DefaultGetLoadedPollsStatusTaskTest 2023-01-26 13:58:30 +01:00
Maxime NATUREL 030e37655e Fixing unit tests in SDK 2023-01-26 13:50:46 +01:00
Maxime NATUREL c7d3e1926f Renaming API field and adding more doc to make things clearer 2023-01-26 11:05:34 +01:00
Maxime NATUREL fc26d61305 Removing a debug log 2023-01-26 11:05:34 +01:00
Maxime NATUREL f9591a5fc6 Fix code quality issues 2023-01-26 11:05:34 +01:00
Maxime NATUREL 7118368a15 Fix copyright in SDK 2023-01-26 11:05:34 +01:00
Maxime NATUREL 8a54f7a4ed Revert nullable field in RoomAPI 2023-01-26 11:05:34 +01:00
Maxime NATUREL 652a2c2834 Fix migration of DB after rebase 2023-01-26 11:05:34 +01:00
Maxime NATUREL cfc67d5b67 Adding unit tests for PollSummaryMapper 2023-01-26 11:05:34 +01:00
Maxime NATUREL 326ece4b08 Fixing code styling issue 2023-01-26 11:05:34 +01:00
Maxime NATUREL 470218ca52 Updating existing unit tests 2023-01-26 11:05:33 +01:00
Maxime NATUREL db2e2916a5 Remove some TODOs 2023-01-26 11:05:33 +01:00
Maxime NATUREL 2f06095273 Remove TODO 2023-01-26 11:05:33 +01:00
Maxime NATUREL 63026a3da5 Using copy() on realm object when getting current poll history status 2023-01-26 11:05:33 +01:00
Maxime NATUREL cd1f41594d Sync polls until now when landing on screen 2023-01-26 11:05:33 +01:00
Maxime NATUREL 05c4de6c6c Adding distinctBy on event ids for polls 2023-01-26 11:05:33 +01:00
Maxime NATUREL 492b8a012d Use Timeline interface to paginate 2023-01-26 11:05:33 +01:00
Maxime NATUREL 4cfd6d29fc Fix query on poll events for encrypted rooms 2023-01-26 11:05:33 +01:00
Maxime NATUREL 6b6dea0c45 Store in DB events which failed to be decrypted 2023-01-26 11:05:32 +01:00
Maxime NATUREL 3ba2c47d1e Load more poll during sync if there is no completed backward load 2023-01-26 11:05:32 +01:00
Maxime NATUREL 96252ec2af Observation of the local events to render UI 2023-01-26 11:05:32 +01:00
Maxime NATUREL 7ca532a5f6 Filter and store poll events 2023-01-26 11:05:32 +01:00
Maxime NATUREL e3a2000e29 Calling syncPolls of SDK service 2023-01-26 11:05:32 +01:00
Maxime NATUREL 10be07590d Get loaded polls status use case 2023-01-26 11:05:32 +01:00
Maxime NATUREL 3e118f24ad Loading events in a loop 2023-01-26 11:05:32 +01:00
Maxime NATUREL 5473789577 Removing non necessary fields that can be computed using other existing fields 2023-01-26 11:05:32 +01:00
Maxime NATUREL aa736e2bfc Set page size to 250 2023-01-26 11:05:31 +01:00
Maxime NATUREL 9d92128631 Starting to implement LoadMorePollsTask with update of poll history status 2023-01-26 11:05:31 +01:00
Maxime NATUREL 1ab6faf2d2 Adding PollHistoryStatusEntity 2023-01-26 11:05:31 +01:00
Maxime NATUREL c7f6ece825 Introducing a new room service for poll history 2023-01-26 11:05:31 +01:00
valere 0e47a441e1 fix measure span 2023-01-26 09:47:29 +01:00
valere e8064fa3d1 fix error in merge 2023-01-25 16:30:11 +01:00
Hugh Nimmo-Smith a78f057381 Merge branch 'develop' into hughns/msc3824-oidc-aware 2023-01-25 14:54:12 +00:00
Hugh Nimmo-Smith dcf3872c33 Merge branch 'develop' into hughns/msc3824-oidc-aware 2023-01-25 14:53:16 +00:00
valere 8b50fa3828 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-25 15:17:17 +01:00
valere 29dee64fb6 Migration for big accounts + update sdk 2023-01-25 14:45:57 +01:00
Maxime NATUREL bb4ec4f542 Call push rule /actions api before the /enabled api 2023-01-25 14:45:17 +01:00
Benoit Marty c802e2d0f7
Merge pull request #7988 from vector-im/yostyle/msc3912 
Implement MSC3912 to delete server side all the data of a deleted voice broadcast
 2023-01-25 10:32:21 +01:00
Florian Renaud f5f32d3965 Fix copyright 2023-01-24 17:45:35 +01:00
Florian Renaud 0870cec118 Remove "with_relations" stable field since the msc is in an unstable state 2023-01-24 17:42:59 +01:00
Florian Renaud dd9fba0626 Inject homeserver capabilities data source instead of service in sdk task 2023-01-24 16:15:15 +01:00
Florian Renaud a3f65b9bcb Remove duplicated code by reusing RedactEventTask 2023-01-24 16:12:01 +01:00
Florian Renaud 300e167577 Add trailing commas 2023-01-24 16:05:49 +01:00
Florian Renaud 78fc68b6f0 Move EventRedactBody to a more appropriate package 2023-01-24 15:56:53 +01:00
Florian Renaud 52d0b826f4 Use named arguments for clarity 2023-01-24 15:47:36 +01:00
Florian Renaud 0704fc5e15 Add missing withRelations fields 2023-01-24 11:37:31 +01:00
Florian Renaud 9c3cacc2da Fix line length 2023-01-24 09:01:37 +01:00
yostyle 781b9954d1 Draft MSC3912 2023-01-24 08:59:54 +01:00
Benoit Marty 1a08a9425b Sentry: Report sync duration and metrics for initial sync and for sync after pause. Not for regular sync. 2023-01-20 14:01:35 +01:00
Benoit Marty 2e8ed1bef2 Prepare to be able to disable `SyncDurationMetricPlugin` for regular sync. 2023-01-20 13:11:01 +01:00
valere f9ed8a4dcf verification state integration 
fix rust/kotlin flavor compilation pbs
 2023-01-19 23:51:50 +01:00
valere f1d3eeb0a4 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-19 11:23:58 +01:00
valere 1ab4a2fd8a Merge branch 'develop' into feature/bca/rust_flavor 2023-01-18 23:38:10 +01:00
Hugh Nimmo-Smith 5194990946 Merge branch 'develop' into hughns/msc3824-oidc-aware 2023-01-18 17:08:36 +00:00
Hugh Nimmo-Smith 3333d86776 Merge branch 'develop' into hughns/msc3824-oidc-aware 2023-01-18 17:08:16 +00:00
Hugh Nimmo-Smith 1ac04b0070 Merge branch 'develop' into hughns/msc3824-oidc-aware 2023-01-18 17:05:36 +00:00
Onuray Sahin fe4e0eb0d9 Render poll question when rendering reply to a poll end event. 2023-01-18 17:38:56 +03:00
Benoit Marty 9537170749 Avoid usage of Realm.freeze(). Map to TimelineEvent sooner. 2023-01-17 18:00:56 +01:00
Benoit Marty 0b5e0fea72 No need to freeze empty RealmList 
This was the source of growing memory usage. Non empty result are supposed to be temporary, so this is fine.
 2023-01-17 16:32:49 +01:00
Benoit Marty b3a50d4f68 Remove unused RealmConfiguration 2023-01-17 15:08:20 +01:00
Benoit Marty 4222761363 More cleanup 2023-01-16 20:15:07 +01:00
Benoit Marty 19e218ead8 Small optimization 2023-01-16 18:02:06 +01:00
Maxime NATUREL 6b98b3023e
Merge pull request #7851 from vector-im/feature/mna/poll-message-decryption-error 
[Poll] Warning message on decryption failure of some events (PSG-1025)
 2023-01-16 10:19:00 +01:00
valere 4ae93d5a2c Merge branch 'develop' into feature/bca/rust_flavor 2023-01-15 17:17:22 +01:00
Maxime NATUREL 60e838a82c Check encrypted event status using the Event model 2023-01-13 16:48:53 +01:00
SpiritCroc 94b996b52a [rich replies] Disable useless recent upstream reply fallback changes 
Change-Id: I37cf9986dba043ae6ca146b98a29e05f004de3a4
 2023-01-13 16:16:33 +01:00
SpiritCroc d4cb55eeaa Merge tag 'v1.5.20' into sc 
Change-Id: I438392b41ebe84dccfae1639ae90102c3d45c680

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector/src/main/java/im/vector/app/core/resources/StringProvider.kt
	vector/src/main/res/xml/vector_settings_advanced_settings.xml
 2023-01-13 14:50:46 +01:00
Onuray Sahin 1787031cc6
Merge pull request #7939 from vector-im/feature/ons/fix_edit_poll 
Fix rendering of edited polls (PSG-963)
 2023-01-13 03:13:53 +03:00
Onuray Sahin 6813571015 Fix rendering bug when poll is edited from another client. 2023-01-12 18:46:18 +03:00
valere c0397875f0 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-12 14:51:03 +01:00
valere f330a00834 fix copyright 2023-01-12 13:54:16 +01:00
valere 3f29c55479 Update verification signaling & handing 
fix encryption hindering verification
 2023-01-12 12:06:57 +01:00
Maxime NATUREL ee3cbd9884 Filter in only encrypted events with relatesTo content 2023-01-12 11:15:38 +01:00
Maxime NATUREL 8b051c5b86 Replace usage of new UnableToDecryptEventEntity by usage of existing EventInsertEntity 2023-01-12 10:02:05 +01:00
Maxime NATUREL fd58875c31 Database migration 2023-01-12 10:02:05 +01:00
Maxime NATUREL b001bc382f Fixing code style issue 2023-01-12 10:01:51 +01:00
Maxime NATUREL e9f59d85b4 Adding unit tests for DefaultCreateUnableToDecryptEventEntityTask 2023-01-12 10:01:51 +01:00
Maxime NATUREL a04c60a85b Adding unit tests for EncryptedEventRelationsAggregationProcessor 2023-01-12 10:01:51 +01:00
Maxime NATUREL 1bd11775e9 Adding unit tests for EncryptedReferenceAggregationProcessor 2023-01-12 10:01:51 +01:00
Maxime NATUREL eb4de37603 Updating unit tests for poll aggregation processor 2023-01-12 10:01:51 +01:00
Maxime NATUREL fdc28c0383 Add encrypted event id only if not already in the list 2023-01-12 10:01:50 +01:00
Maxime NATUREL 7e1016da7e Changing where we insert UnableToDecryptEventEntity in DB 2023-01-12 10:01:50 +01:00
Maxime NATUREL a29d4399a5 Removing encrypted related id when receiving decrypted event 2023-01-12 10:01:50 +01:00
Maxime NATUREL 3b9faa5f31 Render specific message on decryption error 2023-01-12 10:01:49 +01:00
Maxime NATUREL c0c5e208bd Remove processing of encrypted events from EventRelationsAggregationProcessor 2023-01-12 10:00:41 +01:00
Maxime NATUREL ae2639aeb0 Keep track of related events to a poll which had failed to be decrypted 2023-01-12 10:00:41 +01:00
Maxime NATUREL bd7b1f9496 (WIP) Introducing new UnableToDecryptEventEntity 2023-01-12 10:00:40 +01:00
Onuray Sahin 62e0c80a06 Fix rendering edited poll in timeline. 2023-01-11 15:59:15 +03:00
Benoit Marty 273d2e6a63 Remove package declaration from AndroidManifest.xml 2023-01-11 11:38:23 +01:00
Onuray Sahin c012d559b7
Merge pull request #7900 from vector-im/feature/ons/render_ended_poll 
Render ended polls (PSG-904)
 2023-01-10 21:06:03 +03:00
Hugh Nimmo-Smith 624e2ffb19 Fixes from initial review 2023-01-10 17:09:08 +00:00
valere 02dc13e38d Fix existing dm returning local room echo 2023-01-10 16:48:39 +01:00
Benoit Marty 31a0a049b1
Merge pull request #7432 from ByeongsuPark/feature/bspark/enhancement-7111-trim-username 
Add trim to username input when sign-in
 2023-01-10 14:38:56 +01:00
Onuray Sahin a8b111dc8c Code review fixes. 2023-01-10 15:04:13 +03:00
valere 56b1b9dec1 configure encryption settings from state 2023-01-10 10:56:11 +01:00
valere 13d3f4f1a7 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-10 08:55:04 +01:00
valere 3bae04c04a Merge branch 'develop' into feature/bca/rust_flavor 2023-01-09 23:46:14 +01:00
Hugh Nimmo-Smith 53c3e8946f Merge branch 'develop' into hughns/msc3824-oidc-aware 2023-01-09 17:34:26 +00:00
Benoit Marty 6eece5b270 Remove the "device" field from get `/pushrules` response model. 2023-01-09 18:07:47 +01:00
Benoit Marty ca3d441de0 Handle error in the thread list request. 2023-01-09 14:16:12 +01:00
Benoit Marty ce0c514dae Fix link on doc. 2023-01-09 14:11:16 +01:00
valere a217ec220f Handling incoming verification 
Fix SAS state signaling problem, more tests, back navigation
 2023-01-09 09:19:04 +01:00
Hugh Nimmo-Smith e375fa0e67 Detekt 2023-01-06 18:14:14 +00:00
Hugh Nimmo-Smith 7b3c3d0dbb Revert "Squashed commit of the following:" 
This reverts commit 4d6bbbbe89.
 2023-01-06 17:57:50 +00:00
Hugh Nimmo-Smith 4d6bbbbe89 Squashed commit of the following: 
commit a588989d13
Merge: 56067300e0 5ee3eefe96
Author: Benoit Marty <benoitm@matrix.org>
Date:   Fri Jan 6 18:45:18 2023 +0100

    Merge pull request #7875 from vector-im/feature/bma/releaseScript3

    Release script update

commit 56067300e0
Merge: baa46634b5 330a9be787
Author: Benoit Marty <benoitm@matrix.org>
Date:   Fri Jan 6 18:44:55 2023 +0100

    Merge pull request #7905 from RiotTranslateBot/weblate-element-android-element-app

    Translations update from Weblate

commit baa46634b5
Merge: 93021a6028 0d2fb8e3d0
Author: Benoit Marty <benoitm@matrix.org>
Date:   Fri Jan 6 18:44:37 2023 +0100

    Merge pull request #7885 from vector-im/feature/bma/fixLint

    Fix lint false positive

commit 93021a6028
Merge: f856142cdc e9d1de8fba
Author: Benoit Marty <benoitm@matrix.org>
Date:   Fri Jan 6 18:43:53 2023 +0100

    Merge pull request #7724 from vector-im/feature/bma/launchWhenResumed

    Observe ViewEvents only when resumed

commit e9d1de8fba
Author: Benoit Marty <benoit@matrix.org>
Date:   Fri Jan 6 17:36:40 2023 +0100

    Fix compilation issue after rebase.

commit 330a9be787
Merge: f856142cdc 4f2550ae92
Author: Weblate <noreply@weblate.org>
Date:   Fri Jan 6 16:33:47 2023 +0000

    Merge branch 'origin/develop' into Weblate.

commit 4f2550ae92
Author: Linerly <linerly@protonmail.com>
Date:   Wed Jan 4 22:47:24 2023 +0000

    Translated using Weblate (Indonesian)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/id/

commit 5734a270d8
Author: waclaw66 <waclaw66@seznam.cz>
Date:   Wed Jan 4 16:04:26 2023 +0000

    Translated using Weblate (Czech)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/

commit 0882e1bf81
Author: Jeff Huang <s8321414@gmail.com>
Date:   Thu Jan 5 02:10:13 2023 +0000

    Translated using Weblate (Chinese (Traditional))

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/

commit 53db988525
Author: Christian Paul <info@jaller.de>
Date:   Thu Jan 5 16:06:48 2023 +0000

    Translated using Weblate (Esperanto)

    Currently translated at 2.2% (2 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/eo/

commit ff9cf8fd2f
Author: Danial Behzadi <dani.behzi@ubuntu.com>
Date:   Wed Jan 4 17:43:34 2023 +0000

    Translated using Weblate (Persian)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/

commit 8a5aad1ba0
Author: Priit Jõerüüt <riot@joeruut.com>
Date:   Thu Jan 5 07:22:25 2023 +0000

    Translated using Weblate (Estonian)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/et/

commit 2903a644f2
Author: Ihor Hordiichuk <igor_ck@outlook.com>
Date:   Wed Jan 4 19:24:53 2023 +0000

    Translated using Weblate (Ukrainian)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/

commit 96363fb789
Author: Jozef Gaal <preklady@mayday.sk>
Date:   Wed Jan 4 16:18:18 2023 +0000

    Translated using Weblate (Slovak)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/

commit 271b828be0
Author: Szimszon <github@oregpreshaz.eu>
Date:   Wed Jan 4 18:55:35 2023 +0000

    Translated using Weblate (Hungarian)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/

commit bd21f032d4
Author: Glandos <bugs-github@antipoul.fr>
Date:   Thu Jan 5 08:42:07 2023 +0000

    Translated using Weblate (French)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/

commit 860df01902
Author: Vri <element@vrifox.cc>
Date:   Wed Jan 4 16:20:15 2023 +0000

    Translated using Weblate (German)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/de/

commit ed84212c78
Author: Besnik Bleta <besnik@programeshqip.org>
Date:   Wed Jan 4 17:01:03 2023 +0000

    Translated using Weblate (Albanian)

    Currently translated at 99.3% (2558 of 2576 strings)

    Translation: Element Android/Element Android App
    Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/

commit f790921785
Author: Mateus Rodrigues Costa <mateusrodcosta@gmail.com>
Date:   Wed Jan 4 21:12:32 2023 +0000

    Translated using Weblate (Portuguese (Brazil))

    Currently translated at 100.0% (2576 of 2576 strings)

    Translation: Element Android/Element Android App
    Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/

commit 3098ec140d
Author: overtinkering <overtinker@yandex.com>
Date:   Thu Jan 5 18:02:33 2023 +0000

    Translated using Weblate (Spanish)

    Currently translated at 90.7% (2338 of 2576 strings)

    Translation: Element Android/Element Android App
    Translate-URL: https://translate.element.io/projects/element-android/element-app/es/

commit 725722d3f2
Author: Christian Paul <info@jaller.de>
Date:   Thu Jan 5 16:14:10 2023 +0000

    Translated using Weblate (Esperanto)

    Currently translated at 76.0% (1960 of 2576 strings)

    Translation: Element Android/Element Android App
    Translate-URL: https://translate.element.io/projects/element-android/element-app/eo/

commit ea924642ce
Author: Christian Paul <info@jaller.de>
Date:   Thu Jan 5 16:51:43 2023 +0000

    Translated using Weblate (Danish)

    Currently translated at 10.2% (264 of 2576 strings)

    Translation: Element Android/Element Android App
    Translate-URL: https://translate.element.io/projects/element-android/element-app/da/

commit f856142cdc
Merge: b7076a13dc 85cfa433d9
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Jan 6 16:07:44 2023 +0100

    Merge pull request #7886 from vector-im/feature/mna/past-polls-ui

    [Poll] Render past polls list of a room (PSG-1029)

commit b7076a13dc
Merge: 41bcdd7232 dbf3b76331
Author: Benoit Marty <benoitm@matrix.org>
Date:   Fri Jan 6 15:16:16 2023 +0100

    Merge pull request #7879 from vector-im/feature/bma/still_investigating

    Reduce number of crypto database transactions when handling the sync response

commit 7b1724f6dd
Author: Benoit Marty <benoit@matrix.org>
Date:   Fri Jan 6 15:13:01 2023 +0100

    changelog

commit 9768430d5c
Author: Benoit Marty <benoit@matrix.org>
Date:   Mon Dec 19 18:32:07 2022 +0100

    Fix test compilation issue

commit 71bd4f457a
Author: Benoit Marty <benoit@matrix.org>
Date:   Wed Dec 7 17:48:25 2022 +0100

    Ensure posted events from the ViewModel are consumed (once) by the UI
    Inspired from https://github.com/Kotlin/kotlinx.coroutines/issues/3002

commit 9c79d23444
Author: Benoit Marty <benoitm@matrix.org>
Date:   Fri Dec 16 21:02:33 2022 +0100

    Ensure event are not sent if the lifecycle state is not RESUMED

commit 0dd1abb926
Author: Benoit Marty <benoit@matrix.org>
Date:   Tue Dec 6 13:02:02 2022 +0100

    Rename method

commit 41bcdd7232
Merge: b8da53b3bb 7fc9705f3a
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Jan 6 14:18:20 2023 +0100

    Merge pull request #7867 from vector-im/feature/mna/active-polls-ui

    [Poll] Render active polls list of a room (PSG-908)

commit 85cfa433d9
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Jan 6 14:13:58 2023 +0100

    Using ordinal of enum to render tabs

commit b8da53b3bb
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Jan 6 11:56:11 2023 +0000

    Bump checker from 3.27.0 to 3.29.0 (#7903)

    Bumps [checker](https://github.com/typetools/checker-framework) from 3.27.0 to 3.29.0.
    - [Release notes](https://github.com/typetools/checker-framework/releases)
    - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md)
    - [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.27.0...checker-framework-3.29.0)

    ---
    updated-dependencies:
    - dependency-name: org.checkerframework:checker
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit e88e874697
Merge: 2e95d4f97c c3ad7faa2c
Author: Benoit Marty <benoitm@matrix.org>
Date:   Fri Jan 6 10:35:14 2023 +0100

    Merge pull request #7865 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-7.4.3

    Bump dependency-check-gradle from 7.4.1 to 7.4.3

commit 2e95d4f97c
Merge: f1bd9b2cf3 87e661e3b5
Author: Florian Renaud <Florian14@users.noreply.github.com>
Date:   Fri Jan 6 09:10:00 2023 +0100

    Merge pull request #7899 from vector-im/bugfix/fre/buffering_on_last_chunk

    [Voice Broadcast] Stop listening if we reach the last received chunk and there is no last sequence number

commit 9b5fda2689
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Jan 5 15:45:35 2023 +0100

    Fix after rebase

commit a5d076a28a
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Wed Jan 4 10:49:07 2023 +0100

    Adding total votes status for ended poll items

commit 05363dc8ca
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Wed Jan 4 10:30:57 2023 +0100

    Adding winner option views for ended poll items

commit 1cc26449f3
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Wed Jan 4 10:12:34 2023 +0100

    Renaming some ui fields

commit 3deae1101c
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Tue Jan 3 17:32:41 2023 +0100

    Adding extra data for ended poll

commit cf82486efa
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 17:38:55 2022 +0100

    Adding mocked data for ended polls

commit 740591cd38
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 17:31:23 2022 +0100

    Updating unit tests

commit cb45056c1a
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 17:28:57 2022 +0100

    Mutualizing list fragments and add ended polls tab

commit 0b535910d6
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 15:50:32 2022 +0100

    Adding changelog entry

commit 7fc9705f3a
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Jan 5 16:37:06 2023 +0100

    Adding importantForAccessibility attribute to icon

commit 2dab6ed052
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Jan 5 15:27:11 2023 +0100

    Fix horizontal margin of tabs

commit ff9e78be42
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Jan 5 15:20:20 2023 +0100

    Use classical for loop instead of forEach

commit d60403545c
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Jan 5 15:09:41 2023 +0100

    Renaming of filter enum

commit 87e661e3b5
Author: Florian Renaud <florianr@element.io>
Date:   Thu Jan 5 14:36:22 2023 +0100

    Add changelog file

commit 0d2fb8e3d0
Author: Benoit Marty <benoit@matrix.org>
Date:   Wed Jan 4 10:17:35 2023 +0100

    Lint: fix KotlinNullnessAnnotation warning

commit dbf3b76331
Author: Benoit Marty <benoitm@matrix.org>
Date:   Thu Jan 5 11:54:19 2023 +0100

    Update doc.

commit 27d32188bf
Author: Benoit Marty <benoit@matrix.org>
Date:   Thu Jan 5 11:04:20 2023 +0100

    Aggregate data outside of the RealmCryptoStore.

commit 682bb8bde0
Author: Florian Renaud <florianr@element.io>
Date:   Wed Jan 4 14:06:58 2023 +0100

    VB - Stop listening if we reach the last received chunk and there is no last sequence number

commit 30940cb937
Author: Benoit Marty <benoit@matrix.org>
Date:   Thu Jan 5 09:53:12 2023 +0100

    Rename `UserCrossSigningKeys` to `UserIdentity`

commit 7e26c4b6f2
Author: Benoit Marty <benoit@matrix.org>
Date:   Thu Jan 5 09:48:25 2023 +0100

    Rename fun

commit 354554e843
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 16:45:28 2022 +0100

    Ignore missing ContentDescription

commit e82c7afdae
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 15:48:14 2022 +0100

    Replace usage of colorAccent

commit 6c0c5e5064
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 15:12:12 2022 +0100

    Rename poll item layout to be more generic

commit bd9c53a96c
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 14:57:37 2022 +0100

    Show message when list is empty

commit e0b77936c1
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 14:27:11 2022 +0100

    Changing the date format

commit bc985aa1ef
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 14:19:50 2022 +0100

    Adding unit tests for ViewModel

commit 71b7edc6f2
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 12:12:57 2022 +0100

    Adding debug log

commit bf67d2529f
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 12:08:55 2022 +0100

    Allow access of poll history only in debug variant

commit 8de86e7480
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 11:59:48 2022 +0100

    Render mocked data get from use case

commit 77d3b7da04
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 11:40:41 2022 +0100

    Fix missing id in Epoxy model

commit f20513eb16
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 10:56:44 2022 +0100

    Render the active polls list on fragment

commit 7b63f891c3
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 10:42:42 2022 +0100

    Epoxy controller to render active poll list

commit 9f97579f9d
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 10:07:50 2022 +0100

    Epoxy model for active poll

commit 10133bd20f
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Dec 29 17:46:07 2022 +0100

    Setup tab layout when landing on the room polls screen

commit 7436c2e1f5
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Dec 29 16:41:42 2022 +0100

    Navigate to new empty screen

commit cba960fbd7
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Dec 29 16:05:52 2022 +0100

    Adding new entry "Poll history" into room profile screen

commit e903dac224
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Dec 29 15:40:59 2022 +0100

    Adding changelog entry

commit 437b93cc18
Author: Benoit Marty <benoitm@matrix.org>
Date:   Wed Jan 4 11:35:04 2023 +0100

    Add some doc

commit 06f3c11010
Author: Benoit Marty <benoit@matrix.org>
Date:   Tue Jan 3 16:43:09 2023 +0100

    Changelog

commit 02e7157206
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 16:16:17 2023 +0100

    Introduce CryptoCrossSigningKeys container

commit 4c4ef0d73e
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 15:57:39 2023 +0100

    Batch insertion of  user data after downloading keys.

commit f26178fc21
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 15:21:03 2023 +0100

    Avoid useless transaction

commit a386a4762c
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 15:18:32 2023 +0100

    Crypto store: Log realm transactions and the duration

commit c1a8bf828b
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 15:15:15 2023 +0100

    Batch insertion of  `shouldEncryptForInvitedMembers`

commit 6f384c799f
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 15:02:45 2023 +0100

    Batch insertion of  `shouldShareHistory`

commit 0e504e9014
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 11:55:41 2023 +0100

    Format

commit 837590104d
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 11:55:32 2023 +0100

    Avoid launching coroutine for nothing.

commit 56986c3a77
Author: Benoit Marty <benoit@matrix.org>
Date:   Mon Jan 2 21:15:08 2023 +0100

    Add a way to get the access token from the advances settings.

commit 5ee3eefe96
Author: Benoit Marty <benoit@matrix.org>
Date:   Mon Jan 2 16:55:25 2023 +0100

    Pull branch sooner to ensure release version is correctly guessed

commit c3ad7faa2c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Dec 29 23:02:43 2022 +0000

    Bump dependency-check-gradle from 7.4.1 to 7.4.3

    Bumps dependency-check-gradle from 7.4.1 to 7.4.3.

    ---
    updated-dependencies:
    - dependency-name: org.owasp:dependency-check-gradle
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit b3d578d6b8
Author: Benoit Marty <benoit@matrix.org>
Date:   Thu Dec 15 12:44:40 2022 +0100

    Release script: Improve creation of the release on GitHub.

commit 5e1d3e6c8d
Author: Benoit Marty <benoitm@matrix.org>
Date:   Thu Dec 15 12:09:27 2022 +0100

    Escape %
 2023-01-06 17:50:38 +00:00
Benoit Marty baa46634b5
Merge pull request #7885 from vector-im/feature/bma/fixLint 
Fix lint false positive
 2023-01-06 18:44:37 +01:00
Hugh Nimmo-Smith 26d71e214a Updated implementation including outbound link for account management 2023-01-06 17:43:14 +00:00
Onuray Sahin 2c24601155
Merge branch 'develop' into feature/ons/render_ended_poll 2023-01-06 17:21:08 +03:00
Benoit Marty b7076a13dc
Merge pull request #7879 from vector-im/feature/bma/still_investigating 
Reduce number of crypto database transactions when handling the sync response
 2023-01-06 15:16:16 +01:00
Onuray Sahin 37f4cf11bd Merge branch 'develop' into feature/ons/render_ended_poll 2023-01-06 13:29:04 +03:00
Hugh Nimmo-Smith bfed447b21 Merge remote-tracking branch 'upstream/develop' into hughns/msc3824-oidc-aware 2023-01-05 17:03:20 +00:00
Benoit Marty 0d2fb8e3d0 Lint: fix KotlinNullnessAnnotation warning 2023-01-05 14:07:12 +01:00
Onuray Sahin f2359ccac2 Implement ended poll indicator. 2023-01-05 14:54:16 +03:00
Benoit Marty dbf3b76331 Update doc. 2023-01-05 11:54:19 +01:00
Benoit Marty 27d32188bf Aggregate data outside of the RealmCryptoStore. 2023-01-05 11:22:54 +01:00
Benoit Marty 30940cb937 Rename `UserCrossSigningKeys` to `UserIdentity` 2023-01-05 09:53:12 +01:00
Benoit Marty 7e26c4b6f2 Rename fun 2023-01-05 09:48:25 +01:00
Benoit Marty 437b93cc18 Add some doc 2023-01-04 11:35:34 +01:00
valere 419673675c Added Self verification UI test 2023-01-03 19:35:15 +01:00
Benoit Marty 92d048f45a Update replied event when it's updated 
Rebased and squashed.
Authors: Claire and Ganfra
 2023-01-03 18:16:38 +01:00
Benoit Marty 06f3c11010 Changelog 2023-01-03 16:43:09 +01:00
Benoit Marty 02e7157206 Introduce CryptoCrossSigningKeys container 2023-01-03 16:16:17 +01:00
Benoit Marty 4c4ef0d73e Batch insertion of user data after downloading keys. 2023-01-03 15:57:39 +01:00
Benoit Marty f26178fc21 Avoid useless transaction 2023-01-03 15:21:03 +01:00
Benoit Marty a386a4762c Crypto store: Log realm transactions and the duration 2023-01-03 15:18:32 +01:00
Benoit Marty c1a8bf828b Batch insertion of `shouldEncryptForInvitedMembers` 2023-01-03 15:15:15 +01:00
Benoit Marty 6f384c799f Batch insertion of `shouldShareHistory` 2023-01-03 15:02:45 +01:00
Benoit Marty 0e504e9014 Format 2023-01-03 11:55:41 +01:00
Benoit Marty 837590104d Avoid launching coroutine for nothing. 2023-01-03 11:55:32 +01:00
valere 6952d17d16 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-03 09:55:08 +01:00
valere fab0350ca1 rust key safety integration 2023-01-03 09:53:22 +01:00
valere 54e8debc38 cleaning and logs 2023-01-03 09:52:58 +01:00
SpiritCroc dadeadcad4 Merge tag 'v1.5.18' into sc 
Change-Id: I4730268dc4327fb16756e73d4dcb428a8c262ec3
 2023-01-02 17:57:49 +01:00
valere a345c6c8e5 fix 7870 2022-12-31 13:21:07 +01:00
SpiritCroc 740364f733 Merge remote-tracking branch 'deepbluev7/nico/fix-at-room' into sc 
Change-Id: I9587d87c60e70c2efc098b7379a6bac9f9c9be26
 2022-12-31 08:24:15 +01:00
SpiritCroc 25dddf7566 Merge tag 'v1.5.16' into sc 
Change-Id: I98c122b95dd3758d41f4845a42ec9ed2371e174f

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
 2022-12-30 17:58:06 +01:00
valere 25f4f2175a Fix failing tests 2022-12-28 10:19:25 +01:00
valere 558317260b Add migration to clean db from SyncFilterParamsEntity 2022-12-27 15:40:49 +01:00
Onuray Sahin 486968fdc2 Render ended poll. 2022-12-26 14:41:38 +03:00
valere 76fa1bfee5 Merge branch 'develop' into feature/bca/rust_flavor 2022-12-26 09:29:03 +01:00
NIkita Fedrunov 91b4dc1f97 tests are fixed 2022-12-23 13:51:19 +01:00
NIkita Fedrunov d20121603a sync filter params moved to matrix config 2022-12-23 13:10:27 +01:00
SpiritCroc dd83c16e46 Disable useless thread fallback to reply fallback calculation 
Don't ask me why Element did that much effort for those, instead of just
doing rich replies...

Change-Id: I90146a34b7a29896f550fcde50f821af629d7edb
 2022-12-17 15:18:03 +01:00
valere ee5dfba389 fix kotlinCrypto flavor compilation 2022-12-17 11:53:13 +01:00
SpiritCroc aa9e0bc627 Add read receipt debugging 
Change-Id: I2cd0b5feb23962bc36295380fe3e77346f0ea694
 2022-12-17 11:34:39 +01:00
valere 406dfaab85 quick format 2022-12-17 10:52:13 +01:00
valere d337ccd359 Merge branch 'develop' into feature/bca/rust_flavor 2022-12-17 10:51:49 +01:00
Benoit Marty 555cbe5f7d Return faster if list is empty 2022-12-16 20:44:26 +01:00
Benoit Marty b063b25e8c Ignore typing notification for ignored users (part of #2965) 2022-12-16 20:39:44 +01:00
valere 2d388f392f ignore verification events from initial sync 2022-12-16 14:03:11 +01:00
Maxime NATUREL 648f97ba78
Merge pull request #7779 from vector-im/feature/mna/relations-api-poll-end 
[Poll] When a poll is ended, use /relations API to ensure poll results are correct (PSG-1013)
 2022-12-16 10:40:39 +01:00
valere ca2d36303c clean logs 2022-12-16 09:34:01 +01:00
valere 3146f5209b Merge branch 'develop' into feature/bca/rust_flavor 2022-12-16 09:33:37 +01:00