mirrors/SchildiChat-android

mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-27 11:28:33 +03:00

Author	SHA1	Message	Date
valere	438b456f8e	quick incremental backup support	2022-12-08 22:53:16 +01:00
valere	4766bc709d	Fix: ER showing shields in clear rooms	2022-12-08 18:06:05 +01:00
Maxime NATUREL	220b1d86c0	Reverting usage of some stable fields whereas related MSCs have not landed into the specs yet	2022-12-08 17:42:51 +01:00
Onuray Sahin	b09a00efda	Code review fixes.	2022-12-08 17:11:09 +03:00
valere	bfe6207a63	Fix crash when no ER migration needed	2022-12-08 14:44:48 +01:00
Hugh Nimmo-Smith	7bbd91f2a9	Handle error whilst download key for self	2022-12-08 13:27:49 +00:00
Hugh Nimmo-Smith	3a2a916c2f	Clarify comment	2022-12-08 13:27:49 +00:00
Hugh Nimmo-Smith	73fd93148a	Download device keys for self prior to verification checks Fixes https://github.com/vector-im/element-android/issues/7676	2022-12-08 13:27:49 +00:00
valere	14cee226c5	Merge branch 'develop' into feature/bca/rust_flavor	2022-12-08 13:37:43 +01:00
valere	d3ef5cc230	Merge olm to Rust migration	2022-12-08 11:59:46 +01:00
Onuray Sahin	055bf6d302	Revert unused companion object.	2022-12-07 21:41:22 +03:00
Florian Renaud	1a3ca7b1a0	Filter event types from decrypted content	2022-12-07 18:11:51 +01:00
Florian Renaud	6e5461f300	Stop filtering events with reference relationship when computing latest previewable event	2022-12-07 18:11:51 +01:00
Florian Renaud	4d6c04baf9	Add provider for custom event types	2022-12-07 18:11:51 +01:00
Florian Renaud	fdb8743ad3	Create provider package	2022-12-07 18:11:51 +01:00
Onuray Sahin	f4429d4c9c	Handle sync response to delete user and room account data.	2022-12-07 18:58:14 +03:00
Onuray Sahin	765202e05a	Add helper functions to delete user and room account data.	2022-12-07 18:17:43 +03:00
Valere	01533db4e0	Merge pull request #7713 from vector-im/feature/bca/to_device_tracing add to device tracing id	2022-12-07 16:16:20 +01:00
Onuray Sahin	d244f7324c	Add api functions to delete account data.	2022-12-07 18:12:25 +03:00
Amit Kumar	17d25e2597	Enable reset all and skip options (#7721 ) * Dismiss bottomsheet on skipping verification * Enable reset all and skip options * Change ResetAll bottomsheet event to no-op for user verification * Fix strings and improve state step logic in SharedSecureStorageViewModel	2022-12-07 19:40:22 +05:30
SpiritCroc	87100a8536	Merge remote-tracking branch 'upstream/develop' into sc Change-Id: Ifed09540802774e7b1d3f2ab787a7f42f1030b28 Conflicts: vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt	2022-12-07 14:56:07 +01:00
SpiritCroc	001e22bbad	Merge tag 'v1.5.11' into sc Change-Id: Ia736ee03b924e8ec8f641420eac11f5fc68b69f4	2022-12-07 14:36:35 +01:00
Benoit Marty	6c84668611	Hotfix 1.5.11	2022-12-07 13:58:02 +01:00
Benoit Marty	1acd8e1049	Do not propagate failure if saving the filter server side fails. This will be retried later.	2022-12-07 13:55:18 +01:00
valere	63d2886415	use msgid in logs for consistency	2022-12-06 16:07:24 +01:00
valere	8646cc441d	do not add tracing ids to verification events	2022-12-06 15:30:06 +01:00
Benoit Marty	ae93c07597	Do not propagate failure if saving the filter server side fails. This will be retried later.	2022-12-06 15:01:47 +01:00
valere	139eb1708c	fix uncheck cast warning	2022-12-06 08:17:31 +01:00
valere	2ed212aa11	Fix copyright	2022-12-05 18:30:38 +01:00
valere	f2952f2dee	add to device tracing id	2022-12-05 18:15:55 +01:00
valere	cba3c270f5	Reduce room list placeholder lags	2022-12-05 13:47:21 +01:00
valere	0953bc944d	Fix test compilation \| rust / crypto missing api	2022-12-05 13:46:35 +01:00
valere	adacd55a05	Fix backup authdata serialization	2022-12-05 13:45:58 +01:00
Maxime NATUREL	637961bbb1	Update related account data event on notification method change	2022-12-05 09:43:56 +01:00
Maxime NATUREL	14b21dc039	Adding use cases to create and delete notifications settings in account data	2022-12-05 09:43:56 +01:00
valere	03379a6636	Merge branch 'develop' into feature/bca/rust_flavor	2022-12-03 11:15:46 +01:00
SpiritCroc	65be0039a5	Merge tag 'v1.5.10' into merge-v1.5.10 TODO: re-implement our composer constraint changes Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt 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/database/query/ReadQueries.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.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/composer/MessageComposerAction.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.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/detail/timeline/factory/ReadReceiptsItemFactory.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt vector/src/main/res/drawable/ic_voice_mic_recording.xml vector/src/main/res/layout/composer_layout.xml vector/src/main/res/layout/composer_layout_constraint_set_compact.xml vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml vector/src/main/res/layout/composer_rich_text_layout_constraint_set_compact.xml vector/src/main/res/layout/composer_rich_text_layout_constraint_set_expanded.xml vector/src/main/res/layout/composer_rich_text_layout_constraint_set_fullscreen.xml vector/src/main/res/layout/fragment_timeline.xml vector/src/main/res/layout/view_voice_message_recorder.xml vector/src/main/res/xml/vector_settings_preferences.xml vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt Change-Id: I55e95d86b4bb019544d75dcb653afe05194cd224	2022-12-02 22:03:17 +01:00
valere	ae9711b7d1	Basic sentry e2e reporting for rust + decrypt trust	2022-12-02 18:24:23 +01:00
valere	b9045eb25f	ktlint	2022-12-02 12:43:05 +01:00
valere	cb4720f6d5	CI update for ER	2022-12-02 12:40:48 +01:00
valere	17b8d3c97b	fix unhandled exceptions and cleaning	2022-12-02 12:38:12 +01:00
valere	b0168dc633	fix compilation rust	2022-12-01 16:08:01 +01:00
valere	a110c9ee50	fix moshi number parsing for rust	2022-12-01 16:07:28 +01:00
valere	43421e3eb9	update doc	2022-11-30 19:09:13 +01:00
valere	304989f79c	Fix copyrights	2022-11-30 18:15:42 +01:00
valere	9fbc0cdd46	fix compilation	2022-11-30 16:20:02 +01:00
valere	6e371b7d2d	code quality	2022-11-30 16:01:11 +01:00
valere	b3d8b1527c	cleaning	2022-11-30 15:14:31 +01:00
valere	501625c19d	post rebase fix rust flavor	2022-11-30 12:10:34 +01:00
valere	a9b970832e	Merge branch 'develop' into feature/bca/rust_flavor	2022-11-30 11:05:32 +01:00
Benoit Marty	52477aa9d5	version++	2022-11-30 11:03:58 +01:00
valere	bb16d77ec6	fix QR verification	2022-11-30 00:10:46 +01:00
valere	f8d6511c59	rust sas state mapping	2022-11-29 11:22:21 +01:00
valere	fb1995e9c9	only check moshi numbers for rust-sdk	2022-11-29 11:21:54 +01:00
valere	d9342707fd	update rust-sdk bindings	2022-11-28 21:48:46 +01:00
Florian Renaud	49199bd5e2	Merge pull request #7611 from vector-im/feature/fre/voice_broadcast_deletion Be less restritive when pruning redacted events	2022-11-28 13:57:40 +01:00
Florian Renaud	dd81584076	Ad default value to MessageStickerContent.body in case of redaction	2022-11-28 12:12:49 +01:00
Nikita Fedrunov	5aeca1f81a	saving sync filter changed (#7627 )	2022-11-28 09:48:28 +01:00
Florian Renaud	a8f3bb1d4e	Remove to-device events from event type filtering for redaction	2022-11-25 14:42:46 +01:00
Florian Renaud	5a43b76488	Log a warning if the event content is not pruned	2022-11-25 14:42:45 +01:00
Florian Renaud	2477632e2b	Fix exception when getting models on some redacted event An exception was triggered because the excepted model body was null for redacted events	2022-11-25 14:42:45 +01:00
Florian Renaud	0209cc4969	Prune redacted events which are not explicitly restricted	2022-11-25 14:42:45 +01:00
Florian Renaud	eb12b1c99b	Use StableUnstableId object for some event types	2022-11-25 14:42:45 +01:00
Nikita Fedrunov	9349b1ae15	read receipt migration added (#7640 )	2022-11-25 14:24:14 +01:00
Nikita Fedrunov	18bcc83a46	added read receipts for threads (#7474 )	2022-11-25 09:49:06 +01:00
Valere	035b1ebedc	Merge pull request #7594 from vector-im/feature/bca/better_edit_validation Better edit (replace handling)	2022-11-24 17:22:41 +01:00
Valere	bec8b5f71e	code review	2022-11-24 12:45:35 +01:00
Valere	c06eca6936	Migration test and cleaning	2022-11-24 12:45:35 +01:00
Valere	ca907df94b	kdoc fix	2022-11-24 12:45:35 +01:00
Valere	2819957585	fix edit display flicker with local echo	2022-11-24 12:45:35 +01:00
Valere	e5d3206b6f	code review	2022-11-24 12:45:35 +01:00
Valere	d759f26db6	fix fake awaitTx	2022-11-24 12:45:35 +01:00
Valere	8b47bf004e	Fix broken polls states	2022-11-24 12:45:35 +01:00
Valere	3746ede49a	Fix test	2022-11-24 12:45:35 +01:00
Valere	e66a0541be	Add changelog, some cleaning	2022-11-24 12:45:35 +01:00
Valere	891709ef41	better replace handling	2022-11-24 12:45:35 +01:00
Benoit Marty	ebbfca4ffd	Detekt: Use require() instead of throwing an IllegalArgumentException. [UseRequire]	2022-11-24 11:06:00 +01:00
Valere	d302fdc655	self verification basics	2022-11-23 11:27:39 +01:00
SpiritCroc	bbbefae75c	Rich replies: Use live sender info for reply name, if wanted Change-Id: I3de535c9fdbe7fcff54bee486182b1d84464f832	2022-11-22 13:10:14 +01:00
Valere	4ce6a25c70	refactor for easy unit tests	2022-11-21 15:16:34 +01:00
Valere	bed2c221e3	Fix QR code not always displayed	2022-11-19 22:49:20 +01:00
SpiritCroc	011f9b0853	Add support for sending account custom emotes (MSC-2545) We had support for room emotes and global room emotes, but this one was missing. Change-Id: Ic21078b6d786b46fbcd5512db03d9fd1483b25b1	2022-11-19 16:09:32 +01:00
SpiritCroc	a32fc6bbcb	Omit reply fallback when editing replies, as demanded by spec Change-Id: Iec1567c8c7564a06d22171b8f9451a77f438aeac	2022-11-19 15:02:26 +01:00
SpiritCroc	6c4c35158b	Implement rich replies https://spec.matrix.org/v1.4/client-server-api/#rich-replies Change-Id: I65ea1fd3e42414fc0e5311ad7abf7035bf723a30	2022-11-19 15:02:06 +01:00
Valere	0c1e439313	Actor unit test setup	2022-11-19 00:25:08 +01:00
SpiritCroc	3eeca39c4b	Merge tag 'v1.5.8' into sc Release 1.5.8 Change-Id: I763148cfe6bb2155682637ce4c339951441b87ce 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/sync/SyncResponseHandler.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/composer/MessageComposerFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/res/layout/fragment_timeline.xml	2022-11-18 16:11:16 +01:00
Maxime NATUREL	14de485c67	Merge pull request #7566 from vector-im/fix/mna/missing-translation-reply-to Missing translations on "replyTo" messages (PSG-978)	2022-11-18 14:39:18 +01:00
Valere	5c82bdba38	happy path qr kotlin verif	2022-11-17 22:42:47 +01:00
Benoit Marty	65d898e3de	version++	2022-11-17 12:57:08 +01:00
Benoit Marty	5d3228d97b	`toModel` was not catching com.squareup.moshi.JsonDataException properly (discovered when joining a Jitsi conf added as a Widget)	2022-11-17 12:28:58 +01:00
Jorge Martin Espinosa	10775ab2f3	Editing: default to `MessageContent.body` when no `formattedBody` is present (#7592 ) * Editing: default to `MessageContent.body` when no `formattedBody` is present * Update docs	2022-11-16 12:13:07 +00:00
Valere	cf366f7a9c	suspend verif WIP	2022-11-16 09:12:54 +01:00
Jorge Martin Espinosa	a476544761	Fix some quoted messages having 'null' message bodies (#7532 ) * Fix some quoted messages having 'null' message bodies	2022-11-14 11:01:29 +00:00
Maxime NATUREL	4a65e1153a	Fix retrieve of the question for poll events	2022-11-14 10:18:42 +01:00
Maxime NATUREL	57e90aee83	Removing description parameter in startLiveLocation method of SDK to avoid translated strings in beacon events	2022-11-10 15:40:50 +01:00
Maxime NATUREL	235b629130	Use case to process formatted body of reply to events	2022-11-10 15:29:58 +01:00
SpiritCroc	58dd1dedc9	Render MSC2530 captions Change-Id: I10f875121e90102a0518d9bd39d87b3daa68ef2e	2022-11-10 14:00:26 +01:00
Maxime NATUREL	744b03a806	Merge pull request #7523 from vector-im/feature/mna/push-toggle-current-session Push notifications toggle: align implementation for current session (PSG-971)	2022-11-10 13:44:49 +01:00
Amit Kumar	c07b110b99	Add spannable tracking around SyncResponseHandler (#7514 ) * Add spannable tracking around SyncResponseHandler * Update LICENSE header * Refactor handleResponse and MetricsExtensions * Update changelog.d * Improve code docs and comments * Check if Sentry is enabled before tracking	2022-11-10 16:13:09 +05:30
SpiritCroc	3214c782bc	Fix clearing unread counts if the read receipt was only implicitely set 1. Open room with notifications without reading 2. Send a message 3. Try to mark as read Before: didn't work, as the read receipt was internally already correct After: works, since we force set it either way if we see unread counts Change-Id: I68b20dd0242ea59f454dfbeeabfb58178e4a8395	2022-11-10 10:34:20 +01:00
Maxime NATUREL	ab90da0e51	Adding isReply extension method for RelationDefaultContent	2022-11-10 10:05:01 +01:00
Maxime NATUREL	24a5cfa9e5	Listen for pusher or account data changes to update the local setting	2022-11-10 10:00:27 +01:00
SpiritCroc	773df1f4cc	Merge tag 'v1.5.7' into merge-v1.5.7 Change-Id: I5d64f28783cb2d9a331e97ccfb5b0855fe915c6e	2022-11-10 09:55:04 +01:00
Benoit Marty	d07c6da3ac	Add a test for incomplete word.	2022-11-09 15:31:27 +01:00
Benoit Marty	823e7bf212	Fix search tests.	2022-11-09 15:26:39 +01:00
Maxime NATUREL	fc24beaa68	Merge pull request #7456 from vector-im/feature/mna/session_manager_multi_signout [Session manager] Multi-session signout (PSG-857)	2022-11-08 14:21:14 +01:00
Benoit Marty	c323326a58	Version 1.5.7	2022-11-07 17:14:18 +01:00
NIkita Fedrunov	38651353aa	temporary workaround for a failing sync due to unexpected `enableUnreadThreadNotifications` param	2022-11-07 17:09:20 +01:00
NIkita Fedrunov	0c40acb186	temporary workaround for a failing sync due to unexpected `enableUnreadThreadNotifications` param	2022-11-07 16:16:51 +01:00
Maxime NATUREL	1d2b8e76a2	Adding min size annotation to task params	2022-11-07 11:13:23 +01:00
Maxime NATUREL	76e2b6b39f	Removing some TODOs	2022-11-07 11:09:42 +01:00
Maxime NATUREL	bb262f0c41	Adding new "delete_devices" request API	2022-11-07 11:09:41 +01:00
Florian Renaud	ac0d823c88	Merge pull request #7519 from vector-im/bugfix/fre/unencrypted_media_event_json_type Fix bad content types when sending unencrypted media event with additional content data	2022-11-04 10:40:18 +01:00
Maxime NATUREL	4621488f21	Merge pull request #7476 from vector-im/fix/mna/push-toggle-check-support [Session manager] Hide push notification toggle when there is no server support (PSG-970)	2022-11-04 09:19:04 +01:00
Florian Renaud	c0ba2f2f48	Fix bad content types when sending unencrypted media	2022-11-03 11:28:45 +01:00
SpiritCroc	eab87760fe	Merge tag 'v1.5.6' into sc Change-Id: I4c39b35ff50c57cc9894b709a91691fa745cb0a6 Conflicts: dependencies.gradle matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt 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/database/mapper/RoomSummaryMapper.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt	2022-11-03 09:31:58 +01:00
ganfra	404383e683	Update versions	2022-11-02 17:58:10 +01:00
Maxime NATUREL	52a77e074f	Renaming const for feature value	2022-11-02 09:37:10 +01:00
Maxime NATUREL	1acb42f61d	Adding use case to check support for new enabled field support	2022-11-02 09:37:10 +01:00
Amit Kumar	b6746653f1	Add metrics plugin to track device download keys task (#7438 ) * Add metrics tracking plugin for download device keys * Add support for multiple metrics plugin * Update copyright license header in matrix-sdk-android * Add tests for MetricExtension * Update changelog * Improve MetricsExtension and reformatting	2022-11-02 13:43:57 +05:30
SpiritCroc	9269a4442c	Merge remote-tracking branch 'sc2/merge-v1.5.4-1' into sc Change-Id: Idc08fd88297d8e1f5211908217e32b93fb6df693 Conflicts: vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt	2022-10-28 18:16:15 +02:00
SpiritCroc	759da1fd09	Merge tag 'v1.5.4' into merge-v1.5.4 Change-Id: I3028022ed007c35d0ddbd6a859bc71958b8d2146 Conflicts: library/ui-styles/src/main/res/values/colors.xml matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt 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/send/LocalEchoEventFactory.kt vector-config/src/main/res/values/config-settings.xml vector/src/main/java/im/vector/app/SpaceStateHandler.kt vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/composer/MessageComposerView.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt vector/src/main/res/drawable/ic_voice_mic.xml vector/src/main/res/layout/fragment_timeline.xml vector/src/main/res/layout/view_voice_message_recorder.xml vector/src/main/res/xml/vector_settings_labs.xml	2022-10-28 18:02:53 +02:00
Eric Decanini	29d3856ef2	Merge pull request #7424 from vector-im/feature/eric/msc3773 Implements MSC3773 (Thread Notifications)	2022-10-26 10:44:32 -04:00
Benoit Marty	c8d08e21a8	Small refactor	2022-10-26 12:36:58 +02:00
Benoit Marty	e8046da0ba	Use `GpsTagConstants.ALL_GPS_TAGS` to remove all tags related to GPS.	2022-10-26 12:34:03 +02:00
Benoit Marty	3632e6dc8a	Replace library `org.apache.sanselan:sanselan:0.97-incubator` with `org.apache.commons:commons-imaging:1.0-alpha3`	2022-10-26 12:32:27 +02:00
ericdecanini	dffb9d3d9d	Fixes lint error	2022-10-24 21:39:31 -04:00
ericdecanini	3673e720fa	Code improvements	2022-10-24 10:31:55 -04:00
ericdecanini	35be56a44a	Merge remote-tracking branch 'origin/develop' into feature/eric/msc3773 # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt	2022-10-24 10:28:21 -04:00
SpiritCroc	d880bdb798	Add some extra UTD logging Change-Id: Ie694b2317cb457d314b7cec36bf07a377c2af2d2	2022-10-22 10:59:33 +02:00
ByeongsuPark	75d589bedd	Add trim to username input on sign-in Add trim to username input on the app side and SDK side Signed-off-by: ByeongsuPark <byeongsu@soongsil.ac.kr>	2022-10-22 00:52:43 +09:00
Nikita Fedrunov	113d0ff540	thread read receipts and unread notifications support is added to hom… (#7386 )	2022-10-21 15:06:20 +02:00
ericdecanini	1086ed367e	Fixes thread notifications instantly disappearing	2022-10-20 19:42:06 -04:00
Florian Renaud	d44d81ed46	Merge pull request #7419 from vector-im/feature/fre/voice_broadcast_live_listening Voice broadcast - live listening	2022-10-20 23:52:57 +02:00
Benoit Marty	ed0d255495	Quick improvement on the doc.	2022-10-20 14:03:42 +02:00
Florian Renaud	e9c81ca98f	VoiceBroadcastPlayer - Live listening	2022-10-20 12:51:08 +02:00
ericdecanini	dc7bff10c1	Merge remote-tracking branch 'origin/feature/nfe/threads_notifications_and_receipts' into feature/eric/msc3773 # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt	2022-10-19 17:03:20 -04:00
ericdecanini	2379ce673b	Adds filter event to opt in to thread notifications	2022-10-19 17:02:32 -04:00
Benoit Marty	9122d96fc6	Merge remote-tracking branch 'origin/develop' into develop	2022-10-19 17:17:33 +02:00
Benoit Marty	36eb538a93	Version++	2022-10-19 17:17:21 +02:00
Johannes Marbach	451f5f824a	Merge pull request #7369 from vector-im/feature/hughns/qr_code_login Implement logic for sign in with QR	2022-10-19 17:10:19 +02:00
Hugh Nimmo-Smith	4f652f1026	Request changes from review	2022-10-19 09:12:09 +01:00
Benoit Marty	f5fe5cce62	Merge pull request #7372 from vector-im/feature/bma/fix_getUser_null Handle properly when getUser returns null - prefer using getUserOrDefault	2022-10-19 08:40:44 +02:00
Florian Renaud	fbf242756e	Allow additional content when sending an event	2022-10-18 21:08:08 +02:00
ericdecanini	ed9ecb7fc9	Merge remote-tracking branch 'origin/develop' into feature/eric/msc3773	2022-10-18 11:03:41 -04:00
Hugh Nimmo-Smith	67be8c3c40	The one that got away	2022-10-18 12:44:05 +01:00
Florian Renaud	16c27ba174	Voice Broadcast - Get voice messages events related to a given VB	2022-10-18 13:41:05 +02:00
Florian Renaud	5f35926ce6	Voice Broadcast - Hide related voice message events	2022-10-18 13:41:04 +02:00
Florian Renaud	ce14270fab	Introduce MessageAudioEvent	2022-10-18 13:41:04 +02:00
Hugh Nimmo-Smith	f7e0a19833	Remove redundant annotations	2022-10-18 12:29:48 +01:00
Hugh Nimmo-Smith	811d6d87ae	Reuse getDecimalCodeRepresentation from SAS instead of duplicating code	2022-10-18 12:23:21 +01:00
Hugh Nimmo-Smith	a83fb8bf83	Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt Co-authored-by: Benoit Marty <benoitm@matrix.org>	2022-10-18 12:09:17 +01:00
Hugh Nimmo-Smith	8530f8f280	Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt Co-authored-by: Benoit Marty <benoitm@matrix.org>	2022-10-18 12:09:06 +01:00
Hugh Nimmo-Smith	0d1df3f66e	Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt Co-authored-by: Benoit Marty <benoitm@matrix.org>	2022-10-18 12:08:09 +01:00
NIkita Fedrunov	6f5fefba56	lint	2022-10-18 10:44:20 +02:00
Hugh Nimmo-Smith	376cd1cb36	Missing throws	2022-10-18 09:34:28 +01:00
Hugh Nimmo-Smith	57a8dd4a1f	Whitespce	2022-10-18 09:31:13 +01:00
Hugh Nimmo-Smith	a1d2944c32	Always check master key when provided by verifying device	2022-10-18 09:08:40 +01:00
Hugh Nimmo-Smith	f297117df2	Use mutex	2022-10-18 08:48:28 +01:00
Hugh Nimmo-Smith	8a62dfb34a	Lint	2022-10-18 00:35:43 +01:00
Florian Renaud	fb9c747a20	Reformat and add trailing commas	2022-10-17 22:33:43 +02:00
Florian Renaud	33a021c8ed	Add sdk entry to attach reference to the outgoing events	2022-10-17 22:33:42 +02:00
Florian Renaud	dbc61971df	Reduce duplicated code	2022-10-17 22:33:42 +02:00
Hugh Nimmo-Smith	6d17d51fe9	remove nullability	2022-10-17 17:36:35 +01:00
Hugh Nimmo-Smith	8f4d998362	Lint	2022-10-17 17:33:43 +01:00
Hugh Nimmo-Smith	d3e61a23a9	Fix generator	2022-10-17 17:29:45 +01:00
NIkita Fedrunov	eec99e65bd	thread read receipts and unread notifications support is added to homeserver capatibilities	2022-10-17 18:09:45 +02:00
Hugh Nimmo-Smith	c3669318c1	Merge branch 'feature/hughns/qr_code_login' of https://github.com/vector-im/element-android into feature/hughns/qr_code_login	2022-10-17 16:37:35 +01:00
Hugh Nimmo-Smith	1863e4c3ef	Use unstable prefixes	2022-10-17 16:34:51 +01:00
Onuray Sahin	b2dc0b33b5	Implement try again button action.	2022-10-17 18:32:35 +03:00
Hugh Nimmo-Smith	3d37e0b2a5	Fix enum JsonClass generateAdapter = false	2022-10-17 16:19:03 +01:00
Hugh Nimmo-Smith	623277e31f	Lint	2022-10-17 16:13:49 +01:00
Hugh Nimmo-Smith	e877feed6e	Add @JsonClass to all enums	2022-10-17 16:06:08 +01:00
Hugh Nimmo-Smith	29065b819f	Remove unused class	2022-10-17 16:03:47 +01:00
Hugh Nimmo-Smith	e01ee619d3	Refactor error handling and report E2EE errors	2022-10-17 16:02:25 +01:00
Onuray Sahin	47c87141b2	Merge pull request #7338 from vector-im/feature/ons/qr_code_login_ui QR Code Login UI	2022-10-17 17:20:07 +03:00
Benoit Marty	997341b962	Merge pull request #7282 from vector-im/feature/bma/remove_original_event Stop using `original_event` field	2022-10-17 14:43:22 +02:00
Hugh Nimmo-Smith	d616251f26	Fix merge	2022-10-17 13:41:27 +01:00
Hugh Nimmo-Smith	e89774e160	Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login	2022-10-17 13:26:35 +01:00
Hugh Nimmo-Smith	eb30ef166a	Improve 404 handling	2022-10-17 12:32:40 +01:00
Hugh Nimmo-Smith	1976451c81	Lint	2022-10-17 12:23:14 +01:00
Onuray Sahin	91bb86d3c6	Code review fixes.	2022-10-17 14:16:29 +03:00
Hugh Nimmo-Smith	fb86ab70a2	Comments and error mapping	2022-10-17 12:05:32 +01:00
Hugh Nimmo-Smith	4306c57236	Thread safe use of OlmSAS	2022-10-17 12:01:12 +01:00
Hugh Nimmo-Smith	506fa729ea	Cleanup	2022-10-17 11:50:56 +01:00
Hugh Nimmo-Smith	48de8f4e34	Fix bad merge	2022-10-17 11:48:35 +01:00
Hugh Nimmo-Smith	33be5c257d	Refactor into dedicated files and companion objects	2022-10-17 11:24:48 +01:00
Hugh Nimmo-Smith	ed6bc01bef	Resolve TODO	2022-10-17 10:54:28 +01:00
Hugh Nimmo-Smith	d979b50b2c	Logging cleanup	2022-10-17 10:52:24 +01:00
Benoit Marty	b7570a3c5e	Fix compilation error	2022-10-17 11:31:48 +02:00
Benoit Marty	0cdc21649e	Fix unused import	2022-10-17 11:27:40 +02:00
dependabot[bot]	93a346392b	Bump gradle from 7.2.2 to 7.3.1 (#7364 ) * Bump gradle from 7.2.2 to 7.3.1 Bumps gradle from 7.2.2 to 7.3.1. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Try to fix build issue caused by KSP workaround * Add missing dependency * Suppress false positive in linter * Suppress more false positives, fix 2 possible leaks * Fix tests * Ignore flaky test * Use namespaces instead of packagenames in AndroidManifest files * Reorder dependency groups Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jorge Martín <jorgem@element.io>	2022-10-17 09:14:28 +02:00
SpiritCroc	6a626ea3be	Old layout: Sort order setting to show unreads on top Setting is in options menu. Different setting for home than for spaces, to allow e.g. having unreads on top only for home. Change-Id: Ib390a5601ab78ba8372a4c3161311a52d1016b48	2022-10-15 10:12:12 +02:00
Hugh Nimmo-Smith	fdc55965ca	Linting	2022-10-14 17:23:26 +01:00
Hugh Nimmo-Smith	dc9b41d19a	Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login	2022-10-14 17:12:08 +01:00
Jorge Martin Espinosa	f1acb4712c	Fix editing formatted messages in plain text editor (#7360 ) * Fix editing formatted messages in plain text editor * Update changelog.d/7359.sdk Co-authored-by: Benoit Marty <benoitm@matrix.org> Co-authored-by: Benoit Marty <benoitm@matrix.org>	2022-10-14 15:15:12 +00:00
Onuray Sahin	6c10a9bf2d	Code review fixes.	2022-10-14 18:10:18 +03:00
Hugh Nimmo-Smith	6426ff40d3	Linting	2022-10-14 14:18:50 +01:00
Hugh Nimmo-Smith	411b766890	Refactor to camelcase	2022-10-14 14:17:19 +01:00
Hugh Nimmo-Smith	4325600d27	Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login	2022-10-14 13:57:04 +01:00
Hugh Nimmo-Smith	e439b72e48	Handle master key trust during E2EE set up	2022-10-14 13:46:57 +01:00
Onuray Sahin	5953346b3d	Merge branch 'develop' into feature/ons/qr_code_login_ui # Conflicts: # library/ui-strings/src/main/res/values/strings.xml # matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt # vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt # vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt # vector/src/main/java/im/vector/app/features/VectorFeatures.kt	2022-10-14 15:17:55 +03:00
Benoit Marty	032fa37b64	Create UserDataSource.getUserOrDefault().	2022-10-14 12:13:21 +02:00
Benoit Marty	5a2d74443d	Let GetProfileInfoTask store result into DB, except when we want to do bulk insertion.	2022-10-14 12:07:52 +02:00
Hugh Nimmo-Smith	c00ce91214	Linting	2022-10-14 01:11:25 +01:00
Hugh Nimmo-Smith	c18439f99b	Refactor code into api from internal	2022-10-14 01:07:19 +01:00
Hugh Nimmo-Smith	5abb786b6b	Fix copyright on SDK	2022-10-14 00:59:31 +01:00
Hugh Nimmo-Smith	370652c04b	Revert "Revert "Implementations of MSC3886 and MSC3903"" This reverts commit `489dfd7354`.	2022-10-13 22:37:19 +01:00
Hugh Nimmo-Smith	6399032312	Fix bad merge	2022-10-13 22:23:26 +01:00
Hugh Nimmo-Smith	7bc0bd3b57	Reduce logging	2022-10-13 22:15:07 +01:00
Hugh Nimmo-Smith	dd47297dfd	QR login + E2EE set up	2022-10-13 22:14:55 +01:00
Hugh Nimmo-Smith	bc0843eddf	Another default value fix	2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith	ac80ae5632	Set default value for optional params	2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith	ca7a6efade	Add missing binding	2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith	e2f3dde5c1	Use correct var name	2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith	1e60f3c25b	Make initialDeviceName optional	2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith	d0898a2b89	Linting	2022-10-13 22:13:30 +01:00
Hugh Nimmo-Smith	88238c0f04	Support for login by m.login.token during QR code sign in	2022-10-13 22:13:03 +01:00
Hugh Nimmo-Smith	489dfd7354	Revert "Implementations of MSC3886 and MSC3903" This reverts commit `1235db7895`.	2022-10-13 21:48:27 +01:00
Hugh Nimmo-Smith	e554b43bc6	Merge branch 'feature/ons/qr_code_login_ui' of https://github.com/vector-im/element-android into feature/ons/qr_code_login_ui	2022-10-13 21:27:09 +01:00
Onuray Sahin	fb2776dca4	Cherry pick previous commits.	2022-10-13 20:33:52 +03:00
Hugh Nimmo-Smith	81f2197199	Another default value fix	2022-10-13 16:11:41 +01:00
Hugh Nimmo-Smith	c6e7185f8b	Set default value for optional params	2022-10-13 16:08:50 +01:00
Hugh Nimmo-Smith	8c86b3d297	Add missing binding	2022-10-13 16:02:57 +01:00
Hugh Nimmo-Smith	b5b32b7fda	Use correct var name	2022-10-13 15:58:19 +01:00
Hugh Nimmo-Smith	5bff9ceec4	Make initialDeviceName optional	2022-10-13 15:35:45 +01:00
Hugh Nimmo-Smith	09da74b029	Linting	2022-10-13 15:19:39 +01:00
Hugh Nimmo-Smith	8645f74c77	Support for login by m.login.token during QR code sign in	2022-10-13 15:11:15 +01:00
Benoit Marty	92a2420952	Merge pull request #7293 from vector-im/feature/bma/android13 Android 13	2022-10-13 13:52:52 +02:00
Eric Decanini	963c0e5a50	Local Notification Settings Event (#7300 ) * Adds push notifications switch * Adds functionality to Push notification toggle * Adds DefaultPushersServiceTest for togglePusher * Adds DefaultTogglePusherTaskTest * Adds SessionOverviewViewModelTest for toggling pusher * Hides pusher toggle if there are no pushers of the device * Adds changelog file * Edits changelog file * Fixes copyrights * Unregisters checkedChangelistener in onDetachedFromWindow for switch view * Links notification settings toggle to pusher service * Adds changelog file * Adds error handling to VectorSettingsNotificationPreferenceFragment * Removes comment in FakePushersService * Adds parsing for LocalNotificationSettings event * Adds changelog file * Fixes post merge errors * Fixes imports and improves string name * Fixes legal copies * Fixes kdoc punctuation * Fixes string error * Removes unused imports * Moves LocalNotificationSettingsContent * Fixes lint errors * Fixes test errors * Fixes test errors * Fixes error * Fixes error * Fixes error * Fixes error * Fixes error * Fixes error * Fixes error * Adds lost tests * Adds PusherEntity migration * Fixes session overview layout overlap * Fixes switch being enabled by default * Adds device id and unstable prefix	2022-10-12 23:11:27 -04:00
Benoit Marty	beb334babe	Merge pull request #7335 from vector-im/feature/bma/upgrade_arrow Remove Arrow-kt dependency	2022-10-12 16:26:02 +02:00
Maxime NATUREL	6626732b3b	Merge pull request #7276 from vector-im/feature/mna/device-manager-account-data [Device Management] Save matrix_client_information events on login/registration (PSG-769, PSG-771)	2022-10-12 15:41:40 +02:00
Eric Decanini	9857fa6ca4	Makes "Enable Notifications for this session" respond to enabled value in pusher (#7281 ) * Adds push notifications switch * Adds functionality to Push notification toggle * Adds DefaultPushersServiceTest for togglePusher * Adds DefaultTogglePusherTaskTest * Adds SessionOverviewViewModelTest for toggling pusher * Hides pusher toggle if there are no pushers of the device * Adds changelog file * Edits changelog file * Fixes copyrights * Unregisters checkedChangelistener in onDetachedFromWindow for switch view * Links notification settings toggle to pusher service * Adds changelog file * Adds error handling to VectorSettingsNotificationPreferenceFragment * Removes comment in FakePushersService * Fixes post merge errors * Fixes imports and improves string name * Fixes legal copies * Fixes kdoc punctuation * Fixes string error * Removes unused imports * Fixes lint errors * Fixes test errors * Fixes test errors * Fixes error * Fixes error * Fixes error * Fixes error * Fixes error * Adds lost tests * Adds PusherEntity migration * Fixes session overview layout overlap * Fixes switch being enabled by default * Binds entire view to toggle switch	2022-10-12 09:27:55 -04:00
Onuray Sahin	1e1affbb7b	Merge branch 'develop' into feature/ons/qr_code_login_ui # Conflicts: # library/ui-strings/src/main/res/values/strings.xml # library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml # vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt # vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt # vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt # vector/src/main/java/im/vector/app/features/VectorFeatures.kt # vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt # vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt # vector/src/main/res/layout/fragment_other_sessions.xml # vector/src/main/res/layout/fragment_settings_devices.xml	2022-10-12 14:32:09 +03:00
Benoit Marty	1669316682	Remove dependency to arrow. Please use `org.matrix.android.sdk.api.util.Optional` instead.	2022-10-12 10:20:52 +02:00
Hugh Nimmo-Smith	1235db7895	Implementations of MSC3886 and MSC3903	2022-10-11 23:33:30 +01:00
Jorge Martin Espinosa	def67b2e7d	Integrate WYSIWYG editor (#7288 ) * Add WYSIWYG lib dependency * Replace EditText with RichTextEditor * Add bold button, fix sending formatting messages issues * Add missing inline formatting buttons, make scrollview horizontal * Disable autocomplete for rich text editor * Add formatted text to messages sent, replies, quotes and edited messages. * Several fixes * Add changelog * Try to fix lint issues * Address review comments. * Exclude Epoxy KSP generated files from ktlint checks	2022-10-11 17:05:47 +02:00
Maxime NATUREL	5649933b03	Removing some TODOs	2022-10-11 14:03:12 +02:00
Maxime NATUREL	9877e90df6	Adding use cases to get and set the extra matrix client Info	2022-10-11 14:01:43 +02:00
Eric Decanini	2fe636e93b	Adds Push Notification toggle to Device Manager (#7261 ) * Adds push notifications switch * Adds functionality to Push notification toggle * Adds DefaultPushersServiceTest for togglePusher * Adds DefaultTogglePusherTaskTest * Adds SessionOverviewViewModelTest for toggling pusher * Hides pusher toggle if there are no pushers of the device * Adds changelog file * Edits changelog file * Fixes copyrights * Unregisters checkedChangelistener in onDetachedFromWindow for switch view * Fixes post merge errors * Fixes legal copies * Removes unused imports * Fixes lint errors * Fixes test errors * Fixes error * Fixes error * Fixes error * Fixes error * Fixes error	2022-10-10 19:21:34 -04:00
ericdecanini	4af2e62150	Merge branch 'develop' into feature/eric/msc3881	2022-10-09 12:45:19 -04:00
ericdecanini	cd2e693f0c	Fixes legal copy	2022-10-09 09:48:36 -04:00
ericdecanini	11e251fc1d	Fixes legal copy	2022-10-09 09:48:18 -04:00
ericdecanini	d191bfeaf7	Fixes legal copy	2022-10-09 09:46:07 -04:00
SpiritCroc	fe785613e7	Merge tag 'v1.5.2' into sc Change-Id: I0fe8262be9f2e5852815ad5f93329ffa17970b0e Conflicts: vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt vector/src/main/res/layout/composer_layout.xml vector/src/main/res/layout/composer_layout_constraint_set_compact.xml vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml	2022-10-07 20:32:26 +02:00
SpiritCroc	c634bb74e5	Merge tag 'v1.5.1' into sc Note: we already had picked the internal v1.5.1 patch for the security release, but we still do this merge to make git merge happy again for future merges, and also clean up a little bit of UI things that I did for that patch but abandonned later. Change-Id: I51b674093e6f32e19fc9556109fb0d231d8f8f3e	2022-10-07 19:45:09 +02:00
ericdecanini	a2382c6a01	Adds thread notification fields to RoomSummary	2022-10-07 11:47:18 -04:00
ericdecanini	c2ae75d9bd	Changes thread notifications saved to entity from sum to size	2022-10-07 11:45:58 -04:00
ericdecanini	ebd8461724	Adds thread notifications and highlights to RoomSummaryEntity	2022-10-07 11:42:18 -04:00
ericdecanini	00bfbe9bc6	Adds API parsing of unread threads notifications	2022-10-07 11:16:41 -04:00
Valere	ae02eb18de	Prepare flavors	2022-10-07 14:34:36 +02:00
Benoit Marty	e9e2e5011b	Fix test compilation.	2022-10-07 10:08:33 +02:00
Florian Renaud	4091d27311	Add "io.element.voice_broadcast_info" state event	2022-10-06 16:23:40 +02:00
Benoit Marty	15616ecc7c	Fix compilation issue after rebase	2022-10-05 17:35:05 +02:00
Benoit Marty	f2bbdc3906	API 33: fix compilation warnings	2022-10-05 17:35:05 +02:00
Benoit Marty	80c210e62d	Merge pull request #7292 from vector-im/feature/mna/device-manager-type-icons [Device Management] Show correct device type icons (PSG-775)	2022-10-05 17:30:42 +02:00
Benoit Marty	38ca3b6cdb	Version++	2022-10-05 17:20:05 +02:00
Valere	502b12a07e	Merge pull request #7290 from vector-im/feature/bca/hinder_verification E2ee dos not hinder verification	2022-10-05 14:34:34 +02:00
Valere	fddeddacc7	fix outdated doc	2022-10-05 10:42:29 +02:00
Valere	37458d41f2	E2ee dos not hinder verification	2022-10-05 10:42:29 +02:00
Valere	68d4ac34c7	Move setting to room profile	2022-10-05 10:27:12 +02:00
Valere	f7d8356327	post rebase fix & cleaning	2022-10-05 10:27:12 +02:00
Valere	92a72cb1e9	cleaning	2022-10-05 10:27:12 +02:00
Valere	e9b33f6234	Per room block unverified devices	2022-10-05 10:27:12 +02:00
Maxime NATUREL	f02b689ce0	Adding unit tests for mapper	2022-10-05 10:14:05 +02:00
Maxime NATUREL	b23520ea40	Adding new field for last seen user agent in DB with migration	2022-10-05 10:14:04 +02:00
ericdecanini	034046701d	Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881 # Conflicts: # vector/src/test/java/im/vector/app/test/fakes/FakeCryptoService.kt	2022-10-04 14:05:23 -04:00
Benoit Marty	fdcc7506de	Homeservers will not return `RelationsResponse.original_event` in the future.	2022-10-04 09:28:44 +02:00
Valere	005e712396	Merge pull request #6703 from vector-im/feature/bca/crosssigning_reset_warning warn on cross signing reset	2022-10-03 09:25:52 +02:00
Onuray Sahin	d0dd446af8	Merge pull request #7247 from vector-im/feature/ons/parse_user_agent [Device Manager] Parse user agents (PSG-762)	2022-09-30 18:36:33 +03:00
Valere	b4f7e1381d	fix test post rebase	2022-09-30 16:00:34 +02:00
Valere	59afe434f8	more tests	2022-09-30 16:00:34 +02:00
Valere	ac0e5e9dec	fix broken test, userId confustion cleaning cleaning add tests cleaning	2022-09-30 16:00:34 +02:00
Valere	c8f0792997	warn on cross signing reset	2022-09-30 16:00:34 +02:00
Onuray Sahin	1238f31cdf	Merge pull request #7209 from vector-im/feature/ons/extend_user_agent [Device Manager] Extend user agent to include device information (PSG-755)	2022-09-29 13:11:20 +03:00
Onuray Sahin	0f0ec54ed1	Code review fixes.	2022-09-29 12:20:01 +03:00
Valere	8132a7902b	post merge code quality	2022-09-29 09:21:06 +02:00
Valere	ce86e29122	Merge branch 'main' into develop	2022-09-28 18:16:39 +02:00
Onuray Sahin	5666383134	Add unit test for desktop and web user agents.	2022-09-28 18:19:25 +03:00
Valere	aa42746034	version 1.5.1	2022-09-28 16:28:43 +02:00
Valere	5c442296ef	Security fix CVE-2022-39246 CVE-2022-39248	2022-09-28 16:26:47 +02:00
SpiritCroc	87eaf85224	Security patch v1.5.1 Conflicts: library/ui-styles/src/main/res/values/colors.xml vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt Change-Id: I0c8f5e098f92d0bf42e5ddc41bb6ad43c69bfdd2	2022-09-28 10:41:00 +02:00
Adam Brown	fad02062d8	Instrumentation test coroutines (#7207 ) Converting SDK instrumentation tests from CountdownLatch to suspending functions	2022-09-27 13:37:23 +01:00
Onuray Sahin	c70b6206d0	Add user agent into device info.	2022-09-26 14:39:23 +03:00
ericdecanini	1f28a2acae	Adds PushersMapperTest	2022-09-25 10:45:59 -04:00
SpiritCroc	bb6595110b	Merge tag 'v1.5.0' into merge-v1.5.0 Change-Id: Ifaa56941340ac1774d8b7bd470e32c5203d15f69 Conflicts: library/ui-styles/src/main/res/values/colors.xml matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt vector/build.gradle vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteEmojiDataItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/res/menu/menu_new_home.xml vector/src/main/res/xml/vector_settings_labs.xml	2022-09-23 16:28:00 +02:00
ericdecanini	65c89638ab	Fixes lint error with comments	2022-09-23 09:24:20 -04:00
Onuray Sahin	33eeb721bf	Merge branch 'develop' into feature/ons/extend_user_agent	2022-09-23 16:17:06 +03:00
Onuray Sahin	42983f5ce4	Write unit test for computing user agent user case.	2022-09-23 15:55:02 +03:00
Onuray Sahin	c7108f3ac3	Create use case to compute user agent.	2022-09-23 13:05:16 +03:00
ericdecanini	8c7901177e	Adds comments to new fields in HttpPusher	2022-09-22 20:44:46 -04:00
ericdecanini	75935c824b	Implements MSC3881 (enabled and device_id fields for Pusher API)	2022-09-22 20:35:04 -04:00
Benoit Marty	60bfd0dd42	Merge pull request #7159 from vector-im/feature/bma/fix_new_lint_warning Fix lint warning	2022-09-22 17:35:10 +02:00
Adam Brown	65156a8ece	Merge pull request #7198 from vector-im/feature/adm/configurable-sync-timeout Allow configurable sync timeout	2022-09-22 15:40:58 +01:00
Benoit Marty	7f5c712e88	No need to use `@SuppressLint("NewApi")` when `@ChecksSdkIntAtLeast` is used - more cleanup	2022-09-22 16:34:07 +02:00
Benoit Marty	658a09ea6a	No need to use `@SuppressLint("NewApi")` when `@ChecksSdkIntAtLeast` is used.	2022-09-22 16:32:14 +02:00
Benoit Marty	bb2eb56ee6	Add `@ChecksSdkIntAtLeast` annotation.	2022-09-22 16:32:14 +02:00
Benoit Marty	151f6245db	Merge pull request #6929 from vector-im/feature/bma/android12 Target API 32 (Android 12)	2022-09-22 16:30:04 +02:00
Onuray Sahin	c37a6842fe	Update format to be consistent with Element iOS.	2022-09-22 15:53:29 +03:00
Onuray Sahin	ea78f504d7	Small refactoring.	2022-09-22 15:28:26 +03:00
Onuray Sahin	b2e7cc2208	Extend user agent by adding device manufacturer and model to the beginning.	2022-09-22 15:18:20 +03:00
ganfra	fabfe36ede	Update versions to 1.5.2	2022-09-22 10:31:31 +02:00
Adam Brown	600588dbbb	adding trailing commas	2022-09-21 16:37:31 +01:00
Adam Brown	9ab78c93e2	reducing sync timeout for instrumentation tests to speed them up	2022-09-21 15:39:13 +01:00
Adam Brown	7f31098ba1	lifting the sync timeout to the matrix configuration	2022-09-21 15:39:09 +01:00
Benoit Marty	b9c28ba4ce	Merge branch 'develop' into feature/bma/android12	2022-09-21 16:24:30 +02:00
Florian Renaud	8624199be3	Merge pull request #7154 from vector-im/bugfix/fre/start_dm_app_layout Deferred DMs - Handle the local rooms within the new AppLayout	2022-09-20 10:53:51 +02:00
Florian Renaud	5e504942ca	Delete the local read receipts when deleting the local rooms	2022-09-19 15:58:14 +02:00
Florian Renaud	648498e2de	Move local room check from UpdateBreadcrumbsTask to RoomService	2022-09-19 15:58:14 +02:00
Florian Renaud	3c68222fd7	Do not save local room into recent rooms	2022-09-19 15:58:14 +02:00
Florian Renaud	eac74bda09	Improve nullability check in CreateRoomFromLocalRoomTask	2022-09-19 09:38:05 +02:00
Florian Renaud	3f88811590	remove unused import	2022-09-19 09:38:05 +02:00
Florian Renaud	e2f0e14133	Start DM - Add loading wheel while creating the room	2022-09-19 09:38:05 +02:00
Florian Renaud	824a4bcae5	Add comment to explain the replacementRoom behaviour	2022-09-19 09:38:05 +02:00
Florian Renaud	e76793781d	Use LocalRoomSummaryEntity.where extension	2022-09-19 09:38:05 +02:00
SpiritCroc	7d4c489816	Disable timeline cleanup mechanisms that are no longer necessary Element's new timeline alg should keep is free from timeline loops and empty chunks. Thus, removing these checks should give us back a little bit of faster room loading. Change-Id: I7c6bc314b98410dd47af44e958422860f26771ce	2022-09-17 17:24:19 +02:00
Benoit Marty	cde7096928	Restore this annotation	2022-09-16 23:00:39 +02:00
Benoit Marty	536b9cf926	Move `@Suppress("DEPRECATION")` closer to the deprecated usage. Will help to detect other deprecated API usage.	2022-09-16 23:00:39 +02:00
Benoit Marty	3f3c83a43d	Remove deprecated internal class.	2022-09-16 23:00:39 +02:00
Benoit Marty	73e061e472	Merge pull request #7130 from vector-im/feature/bma/fix_verification Fix empty verification bottom sheet	2022-09-16 19:00:39 +02:00
Benoit Marty	3ddaf0c51f	Ensure `MatrixItem.UserItem` is not null at other places	2022-09-15 11:29:38 +02:00
Florian Renaud	3b1599763c	Start DM - Fix glitch by not showing the local rooms in the room list	2022-09-14 16:41:09 +02:00
Benoit Marty	ec0770434d	Merge pull request #7035 from vector-im/feature/bma/space_response_model Space response model	2022-09-12 17:24:10 +02:00
SpiritCroc	083bc6df0e	Better fallback for inline images without alt description text Use same text as for plain images sent Change-Id: I675558618332f4a0053db5b3f40195b046b5682c	2022-09-11 11:06:45 +02:00
SpiritCroc	387d2e12bb	Inline images: Use alt text in room previews and notifications Change-Id: I6649794d31582c3f5e6ab3e151a866663d4645ee	2022-09-11 09:41:52 +02:00
SpiritCroc	bc1f3cb24d	Merge tag 'v1.4.36' into merge-v1.4.36 Change-Id: I6fa1182a07b7b8ad507124fad3a8971ac38f2ac5 Conflicts: library/ui-strings/src/main/res/values-bg/strings_sc.xml library/ui-strings/src/main/res/values-cs/strings_sc.xml library/ui-strings/src/main/res/values-de/strings_sc.xml library/ui-strings/src/main/res/values-de/strings_sc_donottranslate.xml library/ui-strings/src/main/res/values-es/strings_sc.xml library/ui-strings/src/main/res/values-et/strings_sc.xml library/ui-strings/src/main/res/values-eu/strings_sc.xml library/ui-strings/src/main/res/values-fa/strings_sc.xml library/ui-strings/src/main/res/values-fr/strings_sc.xml library/ui-strings/src/main/res/values-hu/strings_sc.xml library/ui-strings/src/main/res/values-it/strings_sc.xml library/ui-strings/src/main/res/values-nb-rNO/strings_sc.xml library/ui-strings/src/main/res/values-nl/strings_sc.xml library/ui-strings/src/main/res/values-pl/strings_sc.xml library/ui-strings/src/main/res/values-pt-rBR/strings_sc.xml library/ui-strings/src/main/res/values-ro/strings_sc.xml library/ui-strings/src/main/res/values-ru/strings_sc.xml library/ui-strings/src/main/res/values-sk/strings_sc.xml library/ui-strings/src/main/res/values-sv/strings_sc.xml library/ui-strings/src/main/res/values-tr/strings_sc.xml library/ui-strings/src/main/res/values-vi/strings_sc.xml library/ui-strings/src/main/res/values-zh-rCN/strings_sc.xml library/ui-strings/src/main/res/values-zh-rTW/strings_sc.xml 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/summary/RoomSummaryUpdater.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml vector-app/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png vector-app/src/main/res/mipmap-hdpi/ic_launcher_sc.png vector-app/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png vector-app/src/main/res/mipmap-mdpi/ic_launcher_sc.png vector-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png vector-app/src/main/res/mipmap-xhdpi/ic_launcher_sc.png vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png vector/build.gradle vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt vector/src/main/java/im/vector/app/core/di/FragmentModule.kt vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/item/MessageImageVideoItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt vector/src/main/res/xml/vector_settings_labs.xml vector/src/main/res/xml/vector_settings_preferences.xml	2022-09-10 15:24:40 +02:00
Benoit Marty	e37344a059	Version++	2022-09-10 08:15:31 +02:00
Maxime NATUREL	669beb1156	Fix missing mapper in CryptoStoreHelper for tests	2022-09-07 10:27:19 +02:00
Maxime NATUREL	fb8d4668d8	Fixing wrong copyright title	2022-09-07 09:32:47 +02:00
Maxime NATUREL	611749c08f	Adding unit tests for mapper	2022-09-07 09:32:47 +02:00
Maxime NATUREL	e542dc4aac	Adding a method to retrieve livedata of crypto device info for a given device id	2022-09-07 09:32:47 +02:00
Maxime NATUREL	f74a0b0901	Adding a method to retrieve livedata of device info for a given device id	2022-09-07 09:32:47 +02:00
Maxime NATUREL	2a599d9760	Small renamings/reorganization in CryptoService	2022-09-07 09:32:47 +02:00
Benoit Marty	8f69c5e0bc	Split long lines and improve readability.	2022-09-06 12:10:21 +02:00
Benoit Marty	3c7889c95d	Some cleanup	2022-09-06 11:36:44 +02:00
Benoit Marty	9347bc8cf4	Use a dedicated model for `rooms/{roomId}/hierarchy` endpoint result. `rooms.children_state` is now a list of `SpaceChildSummaryEvent` instead of a list of `Event`.	2022-09-06 11:36:28 +02:00
Adam Brown	5c994ebfdd	lifting the phonenumber dependency to the deps file and exposing as api for the app level module	2022-08-31 09:16:00 +01:00
Benoit Marty	456d831a7d	Merge pull request #6917 from vector-im/feature/bma/incr_sync_perf Feature/bma/incr sync perf	2022-08-31 09:06:32 +02:00
Benoit Marty	51dcaf7556	Merge pull request #6925 from vector-im/feature/bma/http_log Feature/bma/http log	2022-08-29 15:04:46 +02:00
Benoit Marty	a8eb7d95ac	Create a new `fun` for code clarity	2022-08-29 14:32:12 +02:00
Benoit Marty	f668be5266	Remove tmp comment	2022-08-29 12:39:58 +02:00
Florian Renaud	ee7c0593ba	Fix copyright	2022-08-25 14:37:06 +02:00
Florian Renaud	cac4df7d66	Improve createRoomThreePidEvents for clarity	2022-08-25 14:28:17 +02:00
Florian Renaud	eab4ebc3b1	Remove roomCreatorUserId and use current userId by default	2022-08-25 14:16:20 +02:00
Florian Renaud	90d688c222	Remove useless explicit field type	2022-08-25 14:07:50 +02:00
Florian Renaud	2be2a05795	Change visibility of LocalRoomThirdPartyInviteContent to internal	2022-08-25 14:05:25 +02:00
Florian Renaud	110cabaca1	Remove useless apply in CreateLocalRoomStateEventsTask	2022-08-25 14:00:58 +02:00
Florian Renaud	5d1124aa95	Update doc	2022-08-25 13:57:50 +02:00
Florian Renaud	128ff0d6ec	Extract condition to reduce code complexity	2022-08-25 13:57:50 +02:00
Florian Renaud	cbf9dbf290	Verify tombstone event	2022-08-25 13:57:50 +02:00
Florian Renaud	725537d8fe	Remove safe call	2022-08-25 13:57:50 +02:00
Florian Renaud	3905e564bd	Add unit tests for CreateRoomFromLocalRoomTask	2022-08-25 13:57:49 +02:00
Florian Renaud	882065f6cd	Add unit tests for CreateLocalRoomStateEventsTask	2022-08-25 13:57:49 +02:00
Florian Renaud	e22ce0d842	Set stateKey as empty by default	2022-08-25 13:57:49 +02:00
Florian Renaud	dee8484618	Create local room state events in dedicated task	2022-08-25 13:57:49 +02:00
Florian Renaud	7216f6bd64	Fix local events generation following the specification	2022-08-25 13:57:49 +02:00
Florian Renaud	5df71c6161	Update CreateRoomParams from the potential FeaturePreset before persisting	2022-08-25 13:57:49 +02:00
Florian Renaud	c96343f1d7	Persists CreateRoomParams into LocalRoomSummaryEntity	2022-08-25 13:57:49 +02:00
Florian Renaud	69917ebc2e	Start DM - Handle third party invites	2022-08-25 13:57:49 +02:00
Florian Renaud	b14e3c61b3	Start DM - Fix first message not encrypted	2022-08-25 13:57:49 +02:00
Florian Renaud	72896f1c8a	Create the DM when sending an event	2022-08-25 13:57:49 +02:00
Benoit Marty	66a6018a93	Detekt	2022-08-24 14:06:35 +02:00
SpiritCroc	16ca0951ca	Move viewpager debugging visual feedback to own pref Visual feedback probably not needed for the remaining viewpager issues. Change-Id: I9931c37b9d0c79ba9fd2f27782d0c0eaa5dfd318	2022-08-24 10:22:57 +02:00
Benoit Marty	2c63dee86a	Avoid trying to log formatted Json if Http bodies are not logged.	2022-08-24 10:16:57 +02:00
SpiritCroc	e6023c6bae	Merge tag 'v1.4.34' into sc Change-Id: I7e1939f6c87e14d1497433a9bad4f97e074bb838 Conflicts: vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListAction.kt vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt vector/src/main/res/layout/fragment_login_server_url_form_2.xml vector/src/main/res/layout/fragment_room_list.xml	2022-08-24 10:14:36 +02:00
Benoit Marty	8cec528ac7	Only one FormatterJsonHttpLogger implementation is required.	2022-08-24 10:11:24 +02:00
Benoit Marty	973a5f1d6e	Version++	2022-08-23 17:02:24 +02:00
Benoit Marty	6c2885ff39	Granfra's review	2022-08-23 16:36:39 +02:00
Benoit Marty	58954ed590	Fix Exception: java.lang.IllegalArgumentException: Configurations cannot be different if used to open the same file. See for instance https://github.com/matrix-org/element-android-rageshakes/issues/41975	2022-08-23 15:36:17 +02:00
Benoit Marty	aa750cccbf	typo	2022-08-23 12:03:25 +02:00
Benoit Marty	1a79828aa5	Update comment	2022-08-23 12:01:43 +02:00
Benoit Marty	5c02290ad4	Fix logging issue	2022-08-23 12:00:27 +02:00
Benoit Marty	e3f5d15eaf	Do not fetch user if we do not have the previous content.	2022-08-23 11:19:14 +02:00
Benoit Marty	94a87744ac	Defer the treatment of updating the User profiles to a background Worker.	2022-08-23 11:11:40 +02:00
Adam Brown	b50b6daca1	using wider range network error when deciding to forward to the edit server instead of just unknown host - will also capture timeouts	2022-08-22 17:24:11 +01:00
Adam Brown	841ee33c82	Merge pull request #6837 from vector-im/feature/adm/missing-notifications Missing notifications due to stuck background workers	2022-08-22 17:20:04 +01:00
Benoit Marty	a7666e2112	Set instead of List, to avoid duplication.	2022-08-22 17:45:28 +02:00
Benoit Marty	9a0ea7bc2e	Add some log for further investigation	2022-08-22 17:45:28 +02:00
Benoit Marty	13f7a9fc10	Performance: invoke UpdateTrustWorker only once per incremental sync.	2022-08-22 17:45:28 +02:00
Adam Brown	9b57630eae	Merge pull request #6873 from vector-im/feature/adm/allow-trusting-certificates FTUE - Fix trusting certificates during edit server flow	2022-08-22 11:47:50 +01:00
Benoit Marty	e86058b299	Merge pull request #6884 from vector-im/feature/bma/sync_thread_investigation Ensure sync thread is started	2022-08-22 12:09:54 +02:00
dependabot[bot]	8a2894f038	Bump libphonenumber from 8.12.53 to 8.12.54 Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.53 to 8.12.54. - [Release notes](https://github.com/google/libphonenumber/releases) - [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md) - [Commits](https://github.com/google/libphonenumber/compare/v8.12.53...v8.12.54) --- updated-dependencies: - dependency-name: com.googlecode.libphonenumber:libphonenumber dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-08-22 05:58:19 +00:00
Benoit Marty	fc4f4f7131	Add prefix to the name of the Thread the app is creating	2022-08-19 14:46:51 +02:00
Benoit Marty	eeeb569ae0	Add prefix to the name of the Thread the app is creating	2022-08-19 10:07:34 +02:00
Benoit Marty	0b1b228524	Fix #6782 . Ensure SyncThread is started	2022-08-19 09:55:14 +02:00
Benoit Marty	4ffab7fc13	API: return String instead of printing out to logcat.	2022-08-18 15:09:48 +02:00
Benoit Marty	ec3512fd5b	Increase some log level	2022-08-18 14:58:19 +02:00
Adam Brown	457f7fffee	promoting the accept certificate to an explict ViewEvent - allows a retryAction to be provided to the event to avoid mutatble state within the view model along with providing a clear path of execution	2022-08-18 11:41:19 +01:00
Adam Brown	cc74dcfb90	Merge pull request #6589 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.11.1 Bump realm-gradle-plugin from 10.11.0 to 10.11.1	2022-08-17 16:19:14 +01:00
Adam Brown	1fd1a4e824	fixing SyncWorker becoming stuck in failure state on uncaught exception - the sync worker makes use of the CoroutineWorker which does not stop when the work completes, this means we often append to the existing worker. When appending by default the previous worker result payload is merged with (or in our case overwrites) the input data instead, meaning any failure state is set and kept until the worker stops, which in turns causes the sync worker to never sync - the fix is to make use of an input merge that always favour the request input data instead of the previous worker results	2022-08-17 15:22:28 +01:00
Adam Brown	a56a7adb46	including the worker failure message in the logs and including throwable class name	2022-08-17 15:18:05 +01:00
Benoit Marty	ea465a1b86	Fix false positive on string template suspicious usage.	2022-08-16 16:06:08 +02:00
Benoit Marty	6089d24409	Fix some string template issue.	2022-08-16 16:05:50 +02:00
Hugh Nimmo-Smith	bfc58cbdcf	Merge branch 'develop' into hughns/msc3824-oidc-aware	2022-08-15 00:31:46 +01:00
Hugh Nimmo-Smith	f6016d7b55	Correct copyright on SDK file	2022-08-14 20:36:11 +01:00
Hugh Nimmo-Smith	74146f4f8e	Migrate SSOAction to api package hierachy	2022-08-14 20:15:40 +01:00
Hugh Nimmo-Smith	ec4ed88ee3	Fix lint errors	2022-08-14 19:25:24 +01:00
Florian Renaud	9eb6969456	Use Content models in CreateRoomBodyBuilder	2022-08-12 13:10:49 +02:00
Florian Renaud	a1152ff72c	Improve RoomHistoryVisibility enum mapping	2022-08-12 13:10:49 +02:00
Florian Renaud	a124b514b8	Improve GuestAccess enum mapping	2022-08-12 13:10:49 +02:00
Florian Renaud	969689cdb9	Use CreateRoomStateEvent in RoomFeaturePreset.setupInitialStates	2022-08-12 13:10:49 +02:00
SpiritCroc	5d1722054e	Merge tag 'v1.4.32' into sc Change-Id: Ib3724625b1aada2541e030f9fdaf47a032538c85 Conflicts: .gitignore library/ui-styles/src/main/res/values/styles_toolbar.xml vector/build.gradle vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt vector/src/main/java/im/vector/app/VectorApplication.kt vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/list/RoomListSectionBuilder.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/res/layout/fragment_timeline.xml	2022-08-10 17:07:09 +02:00
Maxime NATUREL	de240b7318	Fixing comment in beacon content model	2022-08-10 15:28:51 +02:00
Adam Brown	defd848363	updating version for next release cycle	2022-08-10 12:30:38 +01:00
SpiritCroc	5726c769ec	Add missed callback unregister in NetworkConnectivityChecker Avoid ConnectivityManager$TooManyRequestsException Change-Id: Ie2a80576940fd9f91d475a2d1b4626d6d4cfd02d	2022-08-09 17:07:27 +02:00
Adam Brown	58d47df37b	Merge pull request #6736 from vector-im/feature/adm/non-ascii-username Fixes crash when entering non ascii username during account creation	2022-08-09 11:52:02 +01:00
Hugh Nimmo-Smith	d41d636dc9	Merge branch 'develop' into hughns/msc3824-oidc-aware	2022-08-08 16:45:51 +01:00
dependabot[bot]	30a8f22028	Bump libphonenumber from 8.12.52 to 8.12.53 Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.52 to 8.12.53. - [Release notes](https://github.com/google/libphonenumber/releases) - [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md) - [Commits](https://github.com/google/libphonenumber/compare/v8.12.52...v8.12.53) --- updated-dependencies: - dependency-name: com.googlecode.libphonenumber:libphonenumber dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-08-04 23:10:43 +00:00
Adam Brown	825ba77bb2	taking into account non ascii characters as invalid username error	2022-08-04 11:58:01 +01:00
Adam Brown	3fe7a9d8d5	Merge pull request #6588 from vector-im/dependabot/gradle/io.gitlab.arturbosch.detekt-1.21.0 Bump io.gitlab.arturbosch.detekt from 1.20.0 to 1.21.0	2022-08-02 12:56:45 +01:00
SpiritCroc	382e3726d6	Merge tag 'v1.4.31' into sc Change-Id: I91353e1ae897942cd95f745d62c9250596c7112e	2022-08-01 19:39:29 +02:00
Adam Brown	e0349b27ed	updating version for hotfix release	2022-08-01 16:51:19 +01:00
SpiritCroc	9ea0f88181	Fix cleartext leak in log Change-Id: Ifb9faaa52f63bcf9c88a8499c2b078dd1a2de62e	2022-08-01 16:11:28 +01:00
SpiritCroc	3845e1435c	Fix cleartext leak in log Change-Id: Ifb9faaa52f63bcf9c88a8499c2b078dd1a2de62e	2022-08-01 13:00:30 +02:00
SpiritCroc	30eff3f7bc	Fix cleartext leak in log Change-Id: Ifb9faaa52f63bcf9c88a8499c2b078dd1a2de62e	2022-08-01 12:51:02 +02:00
SpiritCroc	9b44975635	Merge tag 'v1.4.30' into sc Change-Id: Ia43ff3781ad84699eb36fba937f7213d47fc0510 Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt 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/database/model/RoomSummaryEntity.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt vector/build.gradle vector/src/main/java/im/vector/app/AppStateHandler.kt vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.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/item/DefaultLiveLocationShareStatusItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt vector/src/main/res/xml/vector_settings_labs.xml	2022-07-29 16:55:28 +02:00
Adam Brown	67d4afa012	updating build versions for next release cycle	2022-07-29 09:02:17 +01:00
Adam Brown	e8476882fc	providing a type for the NoFilter to avoid the ambiguity of the nullable param	2022-07-28 10:22:11 +01:00
ganfra	e9f5208efd	Revert "replyTo are not updated if the original message is edited (#6404 )" This reverts commit `99a906fe9b`.	2022-07-27 16:39:13 +02:00
Jorge Martín	b468a9da33	Improve lock screen implementation.	2022-07-27 14:02:18 +02:00
Adam Brown	e6df2b39b4	handling unverified email as a dialog error in the reset password flow with a friendly error message	2022-07-26 16:58:19 +01:00
Maxime NATUREL	d4186af761	Merge pull request #6608 from vector-im/feature/mna/ux-review-fixes-22-07-11 [Location sharing] - Small improvements of UI for live (PSG-613)	2022-07-25 16:42:48 +02:00
Benoit Marty	c28e7c86d4	Merge pull request #6341 from artkoenig/develop Fixed issues with reporting sync state events from different threads	2022-07-25 10:21:12 +02:00
Maxime NATUREL	7f43a1bb06	Updating reply description text	2022-07-25 09:50:54 +02:00
Onuray Sahin	75de805417	Merge pull request #6616 from vector-im/feature/ons/element_call_widget Support element call widget (PSG-627)	2022-07-22 19:03:03 +03:00
ClaireG	99a906fe9b	replyTo are not updated if the original message is edited (#6404 )	2022-07-22 13:35:01 +00:00
Onuray Sahin	d631c709d6	Create use case to check webview permissions.	2022-07-22 14:33:45 +03:00
Valere	fb05ab34d8	Merge pull request #6395 from vector-im/feature/bca/fix_invalid_qr_warning Display specific message when verif code malformed	2022-07-21 12:36:46 +02:00
Nicolas Werner	4a383523e5	Bring back the body match optimization Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>	2022-07-21 12:18:55 +02:00
Onuray Sahin	125135c250	Add element call widget type.	2022-07-21 12:26:08 +03:00
Valere	687c2794fd	use specific unstable/stable class	2022-07-21 10:13:15 +02:00
Valere	d51a1fdb0e	add back withheld tests	2022-07-21 10:01:41 +02:00
Valere	7a3f2bb240	stable name for withheld	2022-07-21 10:01:41 +02:00
ericdecanini	3f637ea41a	Fixes migration crash	2022-07-20 17:50:59 +02:00
ericdecanini	b89df0b520	Adds MigrateSessionTo035	2022-07-20 16:45:35 +02:00
ericdecanini	9e1235d51f	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo034.kt	2022-07-20 16:44:33 +02:00
dependabot[bot]	f0165f69d3	Bump realm-gradle-plugin from 10.11.0 to 10.11.1 Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.11.0 to 10.11.1. - [Release notes](https://github.com/realm/realm-java/releases) - [Changelog](https://github.com/realm/realm-java/blob/v10.11.1/CHANGELOG.md) - [Commits](https://github.com/realm/realm-java/compare/v10.11.0...v10.11.1) --- updated-dependencies: - dependency-name: io.realm:realm-gradle-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-07-20 13:21:00 +00:00
Maxime NATUREL	7639f158d7	Merge pull request #6600 from vector-im/bugfix/mna/lls-ended-too-soon [Location Share] - Live is considered as ended while still active (PSG-617)	2022-07-20 14:01:05 +02:00
Valere	a8cd77c267	Merge pull request #6585 from vector-im/feature/bca/fix_backup_regression fix backup looping same keys	2022-07-20 13:52:47 +02:00
Eric Decanini	7ceef0045b	Merge pull request #6602 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.52 Bump libphonenumber from 8.12.51 to 8.12.52	2022-07-20 13:51:45 +02:00
Eric Decanini	38ba61f144	Merge pull request #6200 from vector-im/bugfix/eric/upgrade-room-deduplication Fixes room not being in space after upgrade	2022-07-20 12:30:42 +02:00
Valere	10b1443fda	add quick test for direct parent name	2022-07-20 12:12:32 +02:00
Eric Decanini	a0bf1787cb	Merge pull request #6593 from vector-im/task/eric/trailing-commas Code style change: Trailing Commas	2022-07-20 11:46:53 +02:00
ericdecanini	5f6f16d94b	Adds migrate session to 034	2022-07-20 11:22:42 +02:00
ericdecanini	ee941cf88d	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo033.kt	2022-07-20 10:56:07 +02:00
Maxime NATUREL	a5fffdfc1b	DB migration	2022-07-20 10:00:19 +02:00
Maxime NATUREL	ca8e4f51e9	Updating unit tests of aggregation process	2022-07-20 09:58:14 +02:00
Maxime NATUREL	3ad754e732	Adding start of live timestamp threshold when deactivating previous beacons	2022-07-20 09:57:52 +02:00
Valere	78afa3f100	no need to store inbound after decrypt	2022-07-20 09:57:31 +02:00
Valere	309642845e	fix backup looping same keys	2022-07-20 09:57:31 +02:00
dependabot[bot]	6332668b8c	Bump libphonenumber from 8.12.51 to 8.12.52 Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.51 to 8.12.52. - [Release notes](https://github.com/google/libphonenumber/releases) - [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md) - [Commits](https://github.com/google/libphonenumber/compare/v8.12.51...v8.12.52) --- updated-dependencies: - dependency-name: com.googlecode.libphonenumber:libphonenumber dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-07-19 23:06:00 +00:00
Maxime NATUREL	c3105c8bb1	Merge pull request #6486 from vector-im/feature/mna/delete-lls [Location sharing] - Delete action on a live message (PSG-523)	2022-07-19 16:43:41 +02:00
Maxime NATUREL	b08337e3a7	Merge pull request #6501 from vector-im/feature/mna/collapse-deleted-events [Timeline] - Collapse redacted events (PSG-523)	2022-07-19 16:39:45 +02:00
ericdecanini	8c53d2f9b0	Reformats modules	2022-07-19 15:11:42 +02:00
Benoit Marty	62f2fe1c16	Detekt: This explicit usage of `it` as the lambda parameter name can be omitted. [ExplicitItLambdaParameter]	2022-07-19 15:02:21 +02:00
Benoit Marty	40f8d94954	Detekt: Use require() instead of throwing an IllegalArgumentException. [UseRequire]	2022-07-19 15:02:21 +02:00
Benoit Marty	70c8703b2b	Merge pull request #6545 from vector-im/feature/adm/ftue-combined-register-copy-review FTUE - Combined register copy review	2022-07-19 14:44:29 +02:00
ericdecanini	f9580e6cd5	Fixes error in RealmSessionStoreMigration	2022-07-19 14:12:56 +02:00
Maxime NATUREL	667b30f145	Refactoring redact task unit tests	2022-07-19 14:06:18 +02:00
Maxime NATUREL	7b15193eff	Renaming a method to reflect its implementation	2022-07-19 14:06:18 +02:00
Maxime NATUREL	17227f1ae6	DB migration	2022-07-19 14:06:16 +02:00
Maxime NATUREL	1277376496	Fix missing handling of redacted beacon location data events	2022-07-19 14:05:13 +02:00
Maxime NATUREL	63626b79de	Redact beacon info event first to refresh timeline faster	2022-07-19 14:05:13 +02:00
Maxime NATUREL	f6415b0a5d	Deleting summaries related to a redacted live location sharing	2022-07-19 14:05:13 +02:00
Maxime NATUREL	d3ad8d8deb	Prune event entity when redacted	2022-07-19 14:05:13 +02:00
Maxime NATUREL	391bf842b4	Calling usecase to redact live location share event	2022-07-19 14:05:13 +02:00
Maxime NATUREL	237a5a18f3	Adding new method in location sharing service to redact a live location share	2022-07-19 14:05:13 +02:00
Maxime NATUREL	c9273dd067	Adding task to redact live location share related events	2022-07-19 14:05:13 +02:00
Maxime NATUREL	c404454cd7	Adding related event ids of live in entity	2022-07-19 14:05:13 +02:00
Maxime NATUREL	bad4eba153	Remove non necessary @MainThread annotations	2022-07-19 14:05:13 +02:00
Maxime NATUREL	9c619001a5	Updating string value for redacted event to be more consistent	2022-07-19 14:04:09 +02:00
ericdecanini	6f9b5c010d	Deletes migration test	2022-07-19 13:49:21 +02:00
ericdecanini	e926871570	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt	2022-07-19 11:17:14 +02:00
Benoit Marty	ade1b7be8c	Add some punctuation to please detekt.	2022-07-19 09:49:34 +02:00
Benoit Marty	3f8cbd1b9c	Create a parent `MatrixRealmMigration` and improve the logs.	2022-07-18 17:22:49 +02:00
Benoit Marty	ae8f977d6b	Log the end of the migration and it's duration	2022-07-18 17:21:49 +02:00
ericdecanini	bc5c53b70d	Fixes copyright lint error	2022-07-18 15:53:51 +02:00
ericdecanini	e6475a3f83	Fixes copyright lint error	2022-07-18 15:47:19 +02:00
ericdecanini	7bb7a085a8	Fixes copyright lint error	2022-07-18 15:38:03 +02:00
ericdecanini	7d29fbc68c	Fixes post merge errors	2022-07-18 15:06:25 +02:00
ericdecanini	c73c36eb26	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo032.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt	2022-07-18 15:05:04 +02:00
ericdecanini	67dd250f83	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-07-18 15:03:42 +02:00
ericdecanini	1ae5965632	Fixes import order	2022-07-18 14:48:10 +02:00
SpiritCroc	dec61e7a35	Merge tag 'v1.4.28' into merge-v1.4.28 Change-Id: I623898b2034f132f23d2ac2dfeedb02fee16cd10 Conflicts: fastlane/README.md vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.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/action/MessageActionsViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt	2022-07-17 18:52:55 +02:00
Valere	4c554e4e85	fix unused import	2022-07-15 14:18:35 +02:00
Valere	e8bd7ea967	fix olm session proliferation	2022-07-15 14:17:44 +02:00
Adam Brown	38763d0575	adding function to extract usernames from full matrix ids	2022-07-15 11:34:12 +01:00
Nikita Fedrunov	c7b54b8d3d	legacy groups removal (#6268 )	2022-07-15 12:25:10 +02:00
Jorge Martín	50f8d0a667	Ignore `forwardPaginationTest` to unblock the CI	2022-07-14 15:42:20 +02:00
Benoit Marty	4c496bb148	Version++	2022-07-13 12:46:32 +02:00
Adam Brown	257f41dbf1	Merge pull request #6471 from vector-im/feature/adm/sharing-tests Adding tests around the share intent handling	2022-07-13 10:12:09 +01:00
Florian Renaud	fca4df3522	Revert "Ensure that Realm is up to date before returning the roomId" This reverts commit `8a5a47c6a5`.	2022-07-11 16:44:32 +02:00
Florian Renaud	fdb9ed80d4	Change method visibility	2022-07-11 16:22:49 +02:00
Florian Renaud	68bd55fef5	Merge branch 'develop' into feature/fre/start_dm_on_first_msg * develop: (156 commits) adding test case for showing html entities are processed adding tests around the event html rendering - the test helper is a little hacky in order to covert the spans to something human readable removing extra line adding changelog entry overriding the default list handler with an implementation that takes into account the initial starting position trigger CI Use executeTransactionAwait (need realm refresh in this case) Bump flipper from 0.152.0 to 0.153.0 Use executeTransactionAwait (need realm refresh in this case) generating 1.4.27 changelog and updating version Fixing crash when sharing plain text, such as a url Fix crashes when opening Thread (#6463) Timeline: fix validation of timeline event changes Fix ConcurrentModificationException on BackgroundDetectionObserver Fix crashes when opening Thread (#6463) suppressing unused string resource Changelog Fix ConcurrentModificationException on BackgroundDetectionObserver Fix typo adding changelog entry ...	2022-07-11 12:03:24 +02:00
SpiritCroc	06a7154abf	[merge] Cleanup leftovers from old timeline fixes Upstream redid some timeline chunk handling, which should make these useless Change-Id: I14f19ecba0bc093261cb2779135ff8c744439e12	2022-07-09 19:51:18 +02:00
SpiritCroc	204e111c1c	Merge tag 'v1.4.27-RC2' into merge-v1.4.27 Change-Id: I6fba3a97a37a4e0a908289272ea9dec2efc85d00 Conflicts: .gitignore matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt 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/database/helper/ChunkEntityHelper.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.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/room/timeline/TokenChunkEventPersistor.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt tmp_sc_fastlane/README.md vector-config/src/main/res/values/config.xml vector/build.gradle vector/src/fdroid/AndroidManifest.xml vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt vector/src/gplay/AndroidManifest.xml vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt vector/src/main/java/im/vector/app/AppStateHandler.kt vector/src/main/java/im/vector/app/VectorApplication.kt vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt vector/src/main/java/im/vector/app/core/receiver/OnApplicationUpgradeOrRebootReceiver.kt vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.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/MergedHeaderItemFactory.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.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/reactions/ViewReactionsEpoxyController.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt vector/src/main/java/im/vector/app/features/home/room/list/ChronologicalRoomComparator.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt vector/src/main/java/im/vector/app/features/navigation/Navigator.kt vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushFromPushGateway.kt vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt vector/src/main/res/xml/vector_settings_notifications.xml	2022-07-09 18:16:33 +02:00
ericdecanini	051f925f0e	Adds MigrateSessionTo032Test	2022-07-07 13:03:58 +01:00
Adam Brown	67d5289f01	Merge pull request #6462 from vector-im/feature/fga/fix_6461 Timeline: fix validation of timeline event changes	2022-07-07 11:25:33 +01:00
Adam Brown	3e770f9efa	Merge pull request #6474 from vector-im/feature/fga/fix_6463 Fix crashes when opening Thread (#6463)	2022-07-07 11:12:28 +01:00
ganfra	8abae6f917	Use executeTransactionAwait (need realm refresh in this case)	2022-07-07 09:40:54 +01:00
ganfra	19fc97ba0f	Use executeTransactionAwait (need realm refresh in this case)	2022-07-06 19:33:34 +02:00
Adam Brown	2cbb5306f9	generating 1.4.27 changelog and updating version	2022-07-06 16:11:11 +01:00
ganfra	6f74f28561	Fix crashes when opening Thread (#6463 )	2022-07-06 15:19:40 +01:00
ganfra	6b8bbf2574	Timeline: fix validation of timeline event changes	2022-07-06 15:19:26 +01:00
Benoit Marty	41a3a07bf6	Fix ConcurrentModificationException on BackgroundDetectionObserver	2022-07-06 15:18:52 +01:00
Adam Brown	169ac9d0a0	updating the known SDK mimetypes and making use of them for the intent switches	2022-07-06 12:06:17 +01:00
ganfra	0743140973	Fix crashes when opening Thread (#6463 )	2022-07-05 17:00:01 +02:00
Benoit Marty	b847d8cf36	Fix ConcurrentModificationException on BackgroundDetectionObserver	2022-07-05 12:06:49 +02:00
ganfra	f58ba13ef0	Timeline: fix validation of timeline event changes	2022-07-05 10:41:22 +02:00
ericdecanini	98d195c010	Changes migration to be realm list field	2022-07-05 09:35:05 +01:00
Nicolas Werner	bc20ad5cf1	Fix tests still passing the word match bool Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>	2022-07-04 22:53:24 +02:00
Nicolas Werner	144d6c99a6	Fix rule parameter not needed anymore	2022-07-04 22:07:52 +02:00
Nicolas Werner	365ec8ef72	Remove unused imports Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>	2022-07-04 21:57:56 +02:00
Nicolas Werner	e980f6bb2f	kotlin is not dart Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>	2022-07-04 21:51:49 +02:00
Nicolas Werner	b24b1a1884	Add negative test for globs on body only matching full words Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>	2022-07-04 21:35:59 +02:00
Nicolas Werner	48fc634825	Add changelog and fix condition not matching globs on body Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>	2022-07-04 21:33:21 +02:00
Nicolas Werner	9df8009ae3	Implement the current spec for event match conditions This fixes that people randomly get pinged on every reply to a user names @roomba:server.tld. fixes #2541 Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>	2022-07-04 21:10:01 +02:00
Florian Renaud	414dc52f7d	Fix copyright date	2022-07-04 18:03:43 +02:00
Florian Renaud	2b6bfc1ebc	Create local events using local echo	2022-07-04 18:00:30 +02:00
Florian Renaud	e89bb0eea7	Set local room members as loaded	2022-07-04 17:53:21 +02:00
Florian Renaud	0d9cd2b3a3	Delete local room related entities with cascade	2022-07-04 17:47:48 +02:00
Florian Renaud	f4b50f1e0f	Fix logs when deleting local room	2022-07-04 17:41:00 +02:00
Florian Renaud	8a5a47c6a5	Ensure that Realm is up to date before returning the roomId	2022-07-04 17:38:32 +02:00
ericdecanini	e003bc973a	Adds clearing to directParentNames	2022-07-04 09:37:36 +01:00
Valere	8dc57fe2f0	Merge pull request #5853 from vector-im/feature/aris/crypto_share_room_keys_past_messages Share Megolm session keys when inviting a new user	2022-07-01 17:33:43 +02:00
Eric Decanini	bdb49f5946	Merge pull request #5398 from vector-im/bugfix/eric/softlogout-ux-broken Fixes broken SoftLogout UX for homeservers that support both Password and SSO	2022-07-01 15:52:48 +01:00
ericdecanini	b437996208	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-07-01 15:47:30 +01:00
Valere	d281f9dde5	use XXX not TODO	2022-07-01 16:07:03 +02:00
Maxime NATUREL	d5b375e82b	Merge pull request #6414 from vector-im/feature/mna/reply-to-lls [Location sharing] - Reply action on a live message (PSG-343)	2022-07-01 16:03:02 +02:00
Valere	6fd99dc302	resist ConnectivityManager$TooManyRequestsException	2022-07-01 15:56:03 +02:00
ericdecanini	ed3a201f0b	Changes directParentName to a list	2022-07-01 13:34:55 +01:00
Valere	90a4e71b06	update flacky test	2022-07-01 14:30:21 +02:00
Maxime NATUREL	f5e33ca980	Fix unit tests	2022-07-01 14:27:10 +02:00
Valere	08cb6de83d	Fix migration	2022-07-01 11:08:35 +02:00
Artjom König	03da067e44	fixed issues with reporting sync state events from different threads	2022-07-01 11:03:29 +02:00
Florian Renaud	0dad4cb02a	Set current ts for local events age	2022-07-01 09:57:45 +02:00
Valere	fb5f0cbd00	Fix test compilation	2022-07-01 09:43:17 +02:00
Valere	e7322e8524	outdated configuration	2022-07-01 09:43:17 +02:00
Valere	5a67c39c7f	reuse code for test	2022-07-01 09:43:17 +02:00
Valere	a885ff5e47	Fix test	2022-07-01 09:43:17 +02:00
Valere	b0907de582	Fix migration	2022-07-01 09:43:17 +02:00
Valere	ddd82441bd	kdoc	2022-07-01 09:43:17 +02:00
Valere	8e829c6aad	Add lab flag and more tests	2022-07-01 09:43:17 +02:00
Valere	d9fb58fbcb	Fix tests	2022-07-01 09:42:31 +02:00
Valere	f64adeba7f	fix bad sender key export	2022-07-01 09:42:31 +02:00
Valere	34145f0374	post rebase fix	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	df241dbdb8	Fix broken unit test	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	010cf540b6	Fix broken unit test	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	55fdff4242	Resolve merge conflicts	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	d3a516b05d	Enhance key sharing to respect matrix configuration	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	a9a7400fef	Add MXCryptoConfig flag for key history sharing Add shared_history flag to sessionBackupData	2022-07-01 09:42:31 +02:00
Valere	fb352ffa38	quick format	2022-07-01 09:42:31 +02:00
Valere	d8d808d0b4	removed deprecated annotation, CI don't like	2022-07-01 09:42:31 +02:00
Valere	8c26592d46	cleaning	2022-07-01 09:42:31 +02:00
Valere	9b8e45ebfe	share keys for history take2	2022-07-01 09:42:31 +02:00
Valere	93aac8faea	post rebase fix	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	2e88998b05	Add integration tests for shared keys rotation on room history visibility change	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	3a5b737639	Fix existing E2eeSanityTests to support changes for key history sharing	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	28dd507a74	Add crypto shared history sanity test	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	96f0d52753	Update copyright	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	243463adbc	Add logs	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	395d48f946	Refactor code structure and improve naming	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	497f7cf044	Rotate our session when there is a room history visibility change since the last outboundSession	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	d6358dcb16	Prevent injecting a forged encrypted message and using session_id/sender_key of another room.	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	28a3ae264c	Remove sharedHistory from OlmInboundGroupSessionWrapper2 while there are migration issues, and use only the equivalent DB entity value	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	dd3928f075	Remove sendSharedHistoryKeys while we will only share latest messages	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	b3bfd05ecb	- Share only the first chunk of inbound sessions instead of the whole key history - Download keys if the user is unknown (first invite)	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	e861edd544	Implement history key sharing functionality with respect to room visibility settings	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	6e57aeb9e5	Add roomId in InboundSessionEntity for better performance Add shared history flag to InboundSessionEntity	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	98b55457b5	Add sendSharedHistoryKeys in crypto service	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	34713d5023	Add sharing existing inbound sessions functionality on new room invites	2022-07-01 09:42:31 +02:00
Florian Renaud	33a19c1ef5	Merge branch 'develop' into feature/fre/start_dm_on_first_msg * develop: (91 commits) Remove unused import Update versions Update CHANGES Improve readability. Weblate: also clean trads Changelog Format file Add android:hasFragileUserData="true" to the manifest. See details in #2352 Clean the TODO delete (UnusedResource not compatible with string template) showing a toast on password reset confirmation lifting duplicated event_base layout to the base class, with the option for children to override using vector model for consistency Replace 5 manual steps to 1 command line step Translated using Weblate (Italian) Translated using Weblate (Swedish) Translated using Weblate (Swedish) Translated using Weblate (Russian) extracting common breaker background selection to ftue extensions removing unused imports adding changelog entry ...	2022-07-01 09:35:40 +02:00
Benoit Marty	c77ecc6a21	Merge pull request #6288 from deepbluev7/nico/stable-aliases Use stable endpoint for alias management	2022-06-30 22:30:14 +02:00
Benoit Marty	58580f1e6a	Merge pull request #6413 from vector-im/feature/bma/room_member_loading Show a loader if all the Room Member are not yet loaded.	2022-06-30 17:13:50 +02:00
Benoit Marty	fbbd6b1a90	Remove unused import	2022-06-30 17:13:13 +02:00
ganfra	6d1dd089f0	Update versions	2022-06-30 16:58:51 +02:00
Adam Brown	054c0435a8	Merge pull request #6130 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.11.0 Bump realm-gradle-plugin from 10.9.0 to 10.11.0	2022-06-30 15:00:21 +01:00
Benoit Marty	90e851a4bc	Merge pull request #6392 from vector-im/feature/bma/safe_clearWith Ensure clearWith lambda is deleting all the list item	2022-06-30 15:46:53 +02:00
Benoit Marty	e53dd1e1a1	Improve readability.	2022-06-30 14:50:20 +02:00
Florian Renaud	3f087eb632	Merge branch 'develop' into feature/fre/start_dm_on_first_msg * develop: (174 commits) Bump libphonenumber from 8.12.50 to 8.12.51 LoadRoomMember: fix presence Cleanup LoadRoomMembers: add changelog LoadRoomMembers: handle room member event a bit more efficiently LoadRoomMembers: exclude Membership.Leave LoadRoomMembers: divide by chunk Bump soloader from 0.10.3 to 0.10.4 Code review fix. Try no using the gradle daemon on CI Harmonize values of `CI_GRADLE_ARG_PROPERTIES` removing unused dependencies and marking soloader and ignored from dependency check (as it's dynamic) Remove non necessary prefix in logs Adding changelog entry Updating the unit tests Stopping existing active live when starting a new one Avoid multiple PR from Dependabot when Flipper is upgraded. Change context inside the get live summary use case Use a TestDispatcher in the FakeSession Code review fixes. ...	2022-06-30 11:48:55 +02:00
Benoit Marty	8da88f9263	Merge pull request #6417 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.51 Bump libphonenumber from 8.12.50 to 8.12.51	2022-06-30 09:07:47 +02:00
dependabot[bot]	5a02bca442	Bump libphonenumber from 8.12.50 to 8.12.51 Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.50 to 8.12.51. - [Release notes](https://github.com/google/libphonenumber/releases) - [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md) - [Commits](https://github.com/google/libphonenumber/compare/v8.12.50...v8.12.51) --- updated-dependencies: - dependency-name: com.googlecode.libphonenumber:libphonenumber dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-29 23:09:57 +00:00
ganfra	b446ceded8	LoadRoomMember: fix presence	2022-06-29 19:01:23 +02:00
ericdecanini	cb400b660d	Fixes post merge error	2022-06-29 17:07:37 +02:00
ericdecanini	9350053214	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent # 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/database/migration/MigrateSessionTo030.kt	2022-06-29 17:05:28 +02:00
ericdecanini	4cf97d48c9	Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt # vector/src/main/java/im/vector/app/features/login/LoginActivity.kt # vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt	2022-06-29 15:53:22 +02:00
Benoit Marty	e75070be91	Use a DataSrouce instead of a Task and return a non Optional Boolean.	2022-06-29 15:35:00 +02:00
Benoit Marty	a0025bc99b	Update after PR review.	2022-06-29 15:05:26 +02:00
Maxime NATUREL	f5d3bcbb94	Sending a reply to a live location share	2022-06-29 15:04:57 +02:00
Benoit Marty	f278e2884a	Fix detekt issue.	2022-06-29 14:18:36 +02:00
Benoit Marty	e91be2b599	Show a loader if all the Room Member are not yet loaded.	2022-06-29 12:19:17 +02:00
ericdecanini	e87d97083f	Merge remote-tracking branch 'origin/develop' into bugfix/eric/upgrade-room-deduplication # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt	2022-06-29 12:02:34 +02:00
ganfra	1a33f6e094	Merge branch 'develop' into feature/fga/load_room_members_by_chunk	2022-06-29 11:45:52 +02:00
ganfra	7d349bdfc3	Cleanup	2022-06-29 11:38:15 +02:00
ganfra	61c5bbc444	LoadRoomMembers: handle room member event a bit more efficiently	2022-06-29 11:35:31 +02:00
ganfra	63f0cce561	LoadRoomMembers: exclude Membership.Leave	2022-06-29 11:34:43 +02:00
ganfra	3a216759a1	LoadRoomMembers: divide by chunk	2022-06-29 11:32:38 +02:00
Maxime NATUREL	e7a68907f9	Merge pull request #6365 from vector-im/feature/mna/start-lls-from-other-device [Location sharing] - Stop any active live before starting a new one (PSF-942)	2022-06-29 09:47:26 +02:00
Maxime NATUREL	d112f860a2	Merge pull request #6356 from vector-im/fix/mna/stop-lls-from-other-device [Location sharing] - Make stop of a live from another device possible (PSF-1060)	2022-06-29 09:45:44 +02:00
Maxime NATUREL	324b3cc68c	Updating the unit tests	2022-06-28 14:36:38 +02:00

... 10 11 12 13 14 ...

6730 commits