Commit graph

6736 commits

Author SHA1 Message Date
Onuray Sahin
8c6c2dd5c2 Code review fixes. 2022-12-12 16:36:40 +03:00
Onuray Sahin
746fb7719a Code review fixes. 2022-12-12 13:39:56 +03:00
Maxime NATUREL
dba8aaea16
Merge pull request #7752 from vector-im/fix/mna/wrong-usage-of-stable-fields
Revert usage of stable fields in live location sharing and polls
2022-12-09 17:32:53 +01:00
Maxime NATUREL
bd91db66f8 Fixing retrieve of related event id in the end poll event during aggregation 2022-12-09 14:07:06 +01:00
Onuray Sahin
8206b534f9 Create a task to delete an event data with a given type. 2022-12-09 14:52:27 +03:00
Onuray Sahin
3d68233723 Support retrieving account data whose key starts with a string. 2022-12-09 14:51:23 +03:00
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