Commit Graph

3105 Commits

Author SHA1 Message Date
SpiritCroc 6aa6f3e01b Merge tag 'v1.1.3' into sc
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13

Conflicts:
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
2021-04-09 11:57:11 +02:00
Benoit Marty 192fc6fd94 Use minimum delay accepted by the Work library. The current value is 10_000 and smaller value will be ignored.
It will remove the warning "W/WM-WorkSpec: Backoff delay duration less than minimum value"
2021-03-17 14:54:15 +01:00
Benoit Marty a4f6fe0cd2 Cleanup 2021-03-17 12:43:05 +01:00
Benoit Marty 616d3c1988 Fix IllegalStateException in UpdateTrustWorker
Also split into 2 methods
2021-03-17 12:42:28 +01:00
Benoit Marty e89e0724a0 limit log 2021-03-17 11:04:17 +01:00
Benoit Marty 1d1f78a020 Timber.d instead of Timber.v 2021-03-17 10:39:25 +01:00
Benoit Marty 9492887345 Restore call to clearUnavailableServersList() removed by mistake
See https://github.com/vector-im/element-android/pull/3001#pullrequestreview-613195611
2021-03-16 14:53:15 +01:00
Benoit Marty 4273a6a1be
Merge pull request #3001 from timokoesters/fix-parsing-servername
fix: make cross signing work with server names containing :
2021-03-16 14:46:47 +01:00
Benoit Marty 431d450fec
Merge branch 'develop' into feature/bma/rr 2021-03-16 14:46:10 +01:00
Benoit Marty a30660ed43 Cleanup 2021-03-16 14:44:40 +01:00
Benoit Marty cb17fa60dc Ganfra's review: delete files after the Realm transaction 2021-03-16 13:29:38 +01:00
Benoit Marty e8bb3d81ed Ganfra's review: inject Moshi Moshi 2021-03-16 12:15:28 +01:00
Timo Kösters dd2a7397a4
fix: make cross signing work with server names containing :
Server names are allowed to contain ':' to specify a port, see https://matrix.org/docs/spec/appendices#server-name
User ids on the other hand are not allowed to contain ':', even
historical user ids, see https://matrix.org/docs/spec/appendices#historical-user-ids

Therefore we can use the first instance of ':' to split the user
localpart from the server name.
2021-03-15 22:31:34 +01:00
Benoit Marty e7c9fb987c Use AwaitTransaction (G's review) 2021-03-15 18:08:33 +01:00
Benoit Marty 4f3734f932 Ensure message are decrypted in the room list after a clear cache 2021-03-15 16:53:19 +01:00
Benoit Marty 75ad6a640b loglimit 2021-03-15 16:02:09 +01:00
Benoit Marty 13cbfaf5e7 Do not load room members in e2e after init sync 2021-03-15 15:29:20 +01:00
Benoit Marty 71f2c50799 Do what the comment said 2021-03-15 15:02:04 +01:00
Benoit Marty c4aadfed33 Better API and avoid copying Collection 2021-03-15 14:35:21 +01:00
Benoit Marty ed662d3add Fix double RR issue when optimizing init sync 2021-03-15 14:19:23 +01:00
SpiritCroc 699ad4eaeb Merge tag 'v1.1.1' into sc
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/res/drawable/rounded_rect_shape.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
2021-03-14 10:58:57 +01:00
Benoit Marty 0c774c098f No op for empty list 2021-03-12 19:08:57 +01:00
Benoit Marty e3d2186c25 Rework UpdateTrustWorker, should have better perf. 2021-03-12 18:55:53 +01:00
Benoit Marty 857bfcb971 Cleanup 2021-03-12 12:18:21 +01:00
Benoit Marty 0b0634b531 Ensure tmp file is always deleted when it is read 2021-03-12 12:17:47 +01:00
Benoit Marty fe39c92e25 Load RR when opening a timeline 2021-03-12 12:17:47 +01:00
Benoit Marty 3777b00ad7 Store Ephemeral in files to handle them later (no second transaction) 2021-03-12 12:17:47 +01:00
ganfra a407ed1903 Fix live timeline event race condition 2021-03-11 15:24:06 +01:00
ganfra ea21892d03 Message state: fix and clean code after Benoits review 2021-03-10 19:32:50 +01:00
ganfra 6c8e2f1fd6 Message state: allow edit and copy when failed 2021-03-10 18:10:03 +01:00
ganfra fad4140924 Message states: makes sure the actions bottom sheet is updated with synced event 2021-03-10 17:56:48 +01:00
Onuray Sahin f5f16fd330 Retry and delete options added for all failed messages. 2021-03-10 11:10:23 +01:00
Benoit Marty 1fe8dfa810
Merge pull request #2978 from vector-im/feature/fga/send_queue_rework
Feature/fga/send queue rework
2021-03-10 09:27:21 +01:00
ganfra 7936c2c6f8 Send: clean after Benoits review 2021-03-09 20:23:06 +01:00
ganfra 3c7a108940 Send: clean and update CHANGES 2021-03-09 18:18:28 +01:00
Benoit Marty c360404ed9
Merge pull request #2976 from vector-im/feature/bma/local_echo
Snappier local echo
2021-03-09 15:46:27 +01:00
Benoit Marty eaf27a01e3
Merge pull request #2975 from vector-im/feature/bma/nsfw_filter
Basic filtering for "nsfw" keyword
2021-03-09 15:41:27 +01:00
Benoit Marty 25ea1ba641 Fix issue with local echo 2021-03-09 14:08:33 +01:00
Benoit Marty 66aa9cd888 Cleanup 2021-03-09 13:32:00 +01:00
Benoit Marty 33eed443d9 Split into smaller file - separation of concern 2021-03-09 13:32:00 +01:00
Benoit Marty 63329499ac Add comments 2021-03-09 13:32:00 +01:00
Benoit Marty c57236da30 Code clarity 2021-03-09 13:00:18 +01:00
Benoit Marty 043ddcae2c Migrate RoomDirectoryService to coroutines (#2449) 2021-03-08 13:30:24 +01:00
ganfra a0df20fcd2 Send: clean code and add more logs 2021-03-05 21:03:52 +01:00
ganfra 9174632cfc Send: use coroutines and let room sending queues be independent of each others 2021-03-05 19:17:57 +01:00
Benoit Marty 490780b906 Fix classical init sync (not used anymore, except in debug mode) case. 2021-03-05 09:47:57 +01:00
Benoit Marty ccf8e94c5e Small cleanup 2021-03-05 09:47:57 +01:00
Benoit Marty f28714c5b2 Avoid empty json in filter 2021-03-05 09:47:57 +01:00
Benoit Marty b25f13cceb Rename method for clarity 2021-03-05 09:47:57 +01:00
Benoit Marty 9719c0b2f9 Split init sync insertion into 2 transactions.
Ephemeral Events can be inserted later, so the room list can be displayed faster.
2021-03-05 09:47:57 +01:00