Commit Graph

3078 Commits

Author SHA1 Message Date
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
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
Benoit Marty 9d7c31d531 Riot -> Element 2021-03-05 09:47:57 +01:00
Benoit Marty e5656e264a
Merge pull request #2940 from vector-im/feature/bma/various_fixies
Rework event edition management
2021-03-04 18:03:45 +01:00
Benoit Marty 663fc28cd5 Fix copyright 2021-03-03 19:51:11 +01:00
Benoit Marty 915295efc0 Import SAS strings 2021-03-03 19:36:39 +01:00
Benoit Marty 68364e0a82 Fix test compilation issue 2021-03-03 18:50:21 +01:00
Benoit Marty b8498aecd9 Code quality 2021-03-03 15:17:41 +01:00
Benoit Marty 9c76ee97eb Move SDK strings to the application 2021-03-03 14:50:54 +01:00
Benoit Marty dc63d6ae73 Remove StringProvider from SDK 2021-03-03 14:16:11 +01:00
Benoit Marty a3b1c348ef Create VectorRoomDisplayNameFallbackProvider to provide default room names 2021-03-03 14:15:40 +01:00
Benoit Marty c13ff6a392 Extract Factories to dedicated files 2021-03-03 13:49:50 +01:00
Benoit Marty 8682c95c19 Do not leak user's local in fallback for verification request 2021-03-03 12:52:49 +01:00
Benoit Marty e2e7516a99 Remove string usage from SDK - step 2 - InitSyncStep 2021-03-03 12:45:46 +01:00
Benoit Marty c42b42cb61 Remove string usage from SDK - step 1 - Role
Lint will also be able to detect more possible errors with this change
2021-03-03 12:13:08 +01:00
Weblate 3b9adbf5c8 Merge branch 'origin/develop' into Weblate. 2021-03-03 09:29:37 +00:00
HelaBasa 7864707699 Translated using Weblate (Sinhala)
Currently translated at 0.4% (1 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/si/
2021-03-03 09:28:50 +00:00
Benoit Marty 5c9750fb07 Moar cleanup after rebase and before merge 2021-03-02 19:18:19 +01:00
Valere 533a7bb180 Code Review 2021-03-02 18:52:32 +01:00
Onuray Sahin 4450f51d78 runCatching added to loadMembersTask execution. 2021-03-02 18:50:43 +01:00
Onuray Sahin fae484cb95 Create test for ensureOutboundSession function. 2021-03-02 18:50:43 +01:00
Onuray Sahin 11dffacc48 Code review fixes. 2021-03-02 18:50:43 +01:00
Onuray Sahin 8b39eabc0f Code review fixes. 2021-03-02 18:50:43 +01:00
Onuray Sahin a623395585 Code review fixes. 2021-03-02 18:50:43 +01:00
Onuray Sahin a2de80091d Code review fixes. 2021-03-02 18:49:11 +01:00
Onuray Sahin e92edc7cb1 Fix remember to call the function. 2021-03-02 18:49:11 +01:00
Onuray Sahin ae648c3e11 Make outbound key sharing strategy configurable. 2021-03-02 18:49:11 +01:00
HelaBasa e6265c277e Added translation using Weblate (Sinhala) 2021-03-02 17:32:24 +00:00
Benoit Marty 4e2e73637a Be robust if Event.type is missing (#2946) 2021-03-02 16:14:57 +01:00