mirrors/SchildiChat-android

mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-28 20:08:50 +03:00

Author	SHA1	Message	Date
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
Maxime NATUREL	c2c58f81d8	Stopping existing active live when starting a new one	2022-06-28 14:36:36 +02:00
Valere	a2aa0471c5	Merge pull request #6328 from vector-im/feature/bca/verif_resist_no_age Feature/bca/verif resist no age	2022-06-28 14:13:37 +02:00
Valere	86b888c336	Display specific message when verif code malformed	2022-06-28 12:17:18 +02:00
Benoit Marty	9866bfefed	Ensure clearWith lambda is deleting all the list item, else we will get an infinite loop. This specific error will help to figure out what is happening.	2022-06-28 11:56:41 +02:00
Valere	82e68472dc	code review update	2022-06-28 11:28:06 +02:00
Benoit Marty	69920a6e46	Split long line	2022-06-28 09:26:29 +02:00
Maxime NATUREL	af3718d202	Merge pull request #6376 from vector-im/fix/mna/geo-uri-pattern [Location Share] - Adding missing prefix "u=" for uncertainty in geo URI (PSF-945)	2022-06-28 09:24:55 +02:00
Benoit Marty	a398391908	Merge pull request #6366 from vector-im/feature/ons/poll_view_state_unit_tests Poll view state unit tests [PSF-1130]	2022-06-27 19:59:13 +02:00
Benoit Marty	2f8aeb991e	Merge hotfix 1.4.25 to develop	2022-06-27 18:03:22 +02:00
Benoit Marty	e0b378e2be	Delete all the chunks in one step.	2022-06-27 17:37:04 +02:00
Benoit Marty	d17152cbe2	Delete all the timelineEvents	2022-06-27 17:23:30 +02:00
Maxime NATUREL	5fa3b3f168	Fix pseudo code in comments	2022-06-27 17:18:28 +02:00
Benoit Marty	95969253b5	Prepare hotfix 1.4.25	2022-06-27 14:50:05 +02:00
Benoit Marty	c9a28c1cf1	Fix migration issue. We had an infinite migration, since `clearWith` wait for the list to be empty.	2022-06-27 14:50:05 +02:00
Hugh Nimmo-Smith	d1a9df71a0	Merge branch 'develop' into hughns/msc3824-oidc-aware	2022-06-27 11:45:04 +02:00
Valere	622ada7125	ensure ageLocalTs is set	2022-06-27 09:14:20 +02:00
Adam Brown	c6ef972e3c	adding missing fullstop and removing unused import	2022-06-24 15:08:48 +01:00
Adam Brown	7ac46a2fd1	using consistent parameter name	2022-06-24 15:08:48 +01:00
Adam Brown	4f09160697	adding logout_devices parameter to the password change sdk api, matching reset password	2022-06-24 15:08:48 +01:00
Adam Brown	d9fd627bb1	passing the control of logout devices to the homeserver capabilities model from the entity	2022-06-24 15:08:48 +01:00
Adam Brown	6e3283cb34	moving homeserver feature for logout all devices to the selected homeserver state via the LoginFlowResult	2022-06-24 15:08:48 +01:00
Adam Brown	2d44e47e6a	adding can control sign out homeserver version flag to the HomeserverCapabilities - Includes DB version update and HomeserverCapability migration	2022-06-24 15:08:47 +01:00
Adam Brown	f21e30f7c7	passing the logout devices parameters to the account/password endpoint	2022-06-24 15:05:18 +01:00
Adam Brown	c10254dbfa	exposing if the homeserver supports signing out all devices when starting the reset process	2022-06-24 15:05:18 +01:00
Maxime NATUREL	81e14c7c3b	Observing live status in DB from location sharing Android service	2022-06-24 10:45:49 +02:00
Maxime NATUREL	3cffedd353	Changing in API to get livedata on a live of a given id	2022-06-24 10:45:49 +02:00
Maxime NATUREL	96da695473	Service API to listen live summaries given a list of event ids	2022-06-24 10:45:48 +02:00
Maxime NATUREL	a4cae9ef07	Fixing missing "u=" in geo URI pattern for uncertainty	2022-06-23 17:40:16 +02:00
Hugh Nimmo-Smith	4ae6365034	Use unstable prefix for SSO redirect action param	2022-06-22 17:59:50 +02:00
Hugh Nimmo-Smith	c816b8f562	Partial implementation of MSC3824 - Add action param on SSO redirect - Only show SSO button if indicated - Label button as "Continue"	2022-06-22 17:37:56 +02:00
Adam Brown	9925cf9996	Merge pull request #6362 from vector-im/bugfix/adm/dispatch-to-crash Fixing concurrent `dispatchTo` crash	2022-06-22 14:00:20 +01:00
Adam Brown	0aacde9d9d	updating version for next development cycle - also fixes wrong version in changes doc	2022-06-22 13:48:56 +01:00
Adam Brown	8ada26529a	updating version for 1.4.24 hotfix - is a hotfix for 1.4.22	2022-06-22 12:37:17 +01:00
Adam Brown	23cd6dae42	fixing concurrent dispatch crash by using copy on write set - whilst closing the session, we iterate through all the listeners calling onSessionStopped however some implementations also use this callback to remove themselves from the listeners, causing the concurrent modification crash	2022-06-22 12:19:06 +01:00
Benoit Marty	a525ede25d	Fix migration to 30. Seems that `isNull` with long path is not working correctly.	2022-06-22 11:50:43 +01:00
SpiritCroc	93208eb0d9	Revert "Bring back downstream "Update room previews once we have decryption keys"" This reverts commit `0393dd51c9`. Change-Id: If0bf358a1cf7908e5c46dc598b7a42aa667fe644	2022-06-22 12:40:31 +02:00
SpiritCroc	3b6b51748e	Fix clearing read but not synced messages in notifications When lots (> 10) of messages arrive in a chat, such that not all get /sync'ed, the app couldn't properly check if events that were not synced are before or after the read marker. The previous way to handle this was just to always assume these events would be unread, which caused some old messages show in notifications and not dismiss themselves when appropriate. Unfortunately, we can not safely assume that if the read marker is in the latest chunk, the missing events would be read, since we may be showing "fastlane" notifications from fcm/push before the /sync finished. Thus, with this commit, we now remove messages that weren't synced or paginated if they meet the following heuristic: 1. The read marker is in the latest chunk and 2. The read marker points at an event with a timestamp later than the one of the missing event. Change-Id: I8053252e95a3b2142512f93244647a86b6f1a231	2022-06-22 12:36:16 +02:00
Onuray Sahin	0fe4b9f07f	Test undisclosed poll state.	2022-06-22 12:57:50 +03:00
Benoit Marty	8bea64bc0c	Fix migration to 30. Seems that `isNull` with long path is not working correctly.	2022-06-22 11:56:54 +02:00
SpiritCroc	45b7d7882c	Fix sending emotes or user pills in replies Change-Id: Idc47d2fcfb28359bda89308a8d830469991d268c	2022-06-21 21:54:26 +02:00
SpiritCroc	e47183de8b	Support MSC2545 global room image packs for custom emojis Change-Id: Ic2e2961e5a75b098c2d1ad46f9bf0f36eef85b2e	2022-06-21 18:57:41 +02:00
Adam Brown	f56703abc4	updating version for hotfix release	2022-06-21 14:48:14 +01:00
ganfra	0f29f7848b	Feature/fga/simplify timeline logic (#6318 ) * Sync: delete all previous chunks in case of gappy sync * Chunk: dont link chunks if we find existing timeline event (keep multiple timeline events in db) * Timeline : remove some unused code * Clean and add changelog * Timeline: set named argument * Timeline: avoid restarting the timeline when there is a CancellationException due to permalink * Timeline: add migration to clean up old (broken) chunks * Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo030.kt Co-authored-by: Benoit Marty <benoitm@matrix.org> * Timeline: try to fix test * ignoring broken instrumentation test in order to release Co-authored-by: ganfra <francoisg@element.io> Co-authored-by: Benoit Marty <benoitm@matrix.org> Co-authored-by: Adam Brown <adampsbrown@gmail.com>	2022-06-21 14:47:13 +01:00
ganfra	b07e0a47e8	Feature/fga/simplify timeline logic (#6318 ) * Sync: delete all previous chunks in case of gappy sync * Chunk: dont link chunks if we find existing timeline event (keep multiple timeline events in db) * Timeline : remove some unused code * Clean and add changelog * Timeline: set named argument * Timeline: avoid restarting the timeline when there is a CancellationException due to permalink * Timeline: add migration to clean up old (broken) chunks * Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo030.kt Co-authored-by: Benoit Marty <benoitm@matrix.org> * Timeline: try to fix test * ignoring broken instrumentation test in order to release Co-authored-by: ganfra <francoisg@element.io> Co-authored-by: Benoit Marty <benoitm@matrix.org> Co-authored-by: Adam Brown <adampsbrown@gmail.com>	2022-06-21 14:42:50 +01:00
Adam Brown	8754f230d3	removing debug log	2022-06-21 09:15:28 +01:00
Adam Brown	a76b6e522b	splitting unit and instrumentation test tasks so that we can configure the android plugin testCoverage parameter - there's a bug that causes the output to be invalid for unit tests	2022-06-21 09:15:27 +01:00
Jorge Martín	b5aedd4626	Re-implement lock screen feature using our own implementation.	2022-06-20 17:38:05 +02:00
Maxime NATUREL	9047d9d62c	Fixing coding style issues	2022-06-20 11:17:30 +02:00
Maxime NATUREL	082b39e651	Adding return type in the doc for stop API	2022-06-20 11:17:30 +02:00
Maxime NATUREL	e1fc6fa727	Adding tests to cover errors thrown during start/stop process	2022-06-20 11:17:30 +02:00
Maxime NATUREL	3e05431e6f	Fixing unit tests	2022-06-20 11:17:30 +02:00
Maxime NATUREL	9eba3034db	Catching crash when offline during stop of a live location share	2022-06-20 11:17:30 +02:00
Maxime NATUREL	e55c378683	Catching crash when offline during start of a live location share	2022-06-20 11:17:30 +02:00
Maxime NATUREL	b16ccf5098	Fix unit tests after rebase	2022-06-20 10:16:27 +02:00
Maxime NATUREL	dcca546c4b	Fixing pusherTask tests	2022-06-20 09:28:35 +02:00
Maxime NATUREL	d0b598463f	Adding test for stop live location share task	2022-06-20 09:28:35 +02:00
Maxime NATUREL	af039371e1	Adding test for start live location share task	2022-06-20 09:28:35 +02:00
Maxime NATUREL	8860dac759	Improving send locations tasks tests	2022-06-20 09:28:35 +02:00
Maxime NATUREL	8d2a914c64	Wip	2022-06-20 09:28:35 +02:00
Maxime NATUREL	707507202d	Renaming method to create static location event	2022-06-20 09:28:35 +02:00
Maxime NATUREL	879cafc8d1	Unit test for send live location task	2022-06-20 09:28:35 +02:00
Maxime NATUREL	1ecc42c903	Unit test for send static location task	2022-06-20 09:28:35 +02:00
Maxime NATUREL	f981900cf3	Unit test for start/stop live location share	2022-06-20 09:28:35 +02:00
Maxime NATUREL	fb7fbced39	Unit test for live location sending	2022-06-20 09:28:35 +02:00
Maxime NATUREL	7332c08bb4	Unit test for static location sending	2022-06-20 09:28:35 +02:00
Maxime NATUREL	7d4df8be09	Unit test for method to get live data of active lives	2022-06-20 09:28:35 +02:00
Maxime NATUREL	7b159c5b71	Send live location API	2022-06-20 09:28:35 +02:00
Maxime NATUREL	9b61c1aead	Send static location API	2022-06-20 09:28:35 +02:00
Maxime NATUREL	632064ffde	Stop live location share API	2022-06-20 09:28:33 +02:00
Maxime NATUREL	29f48249e2	Start live location share API	2022-06-20 09:26:51 +02:00
Maxime NATUREL	539d134b77	Merge pull request #6267 from vector-im/feature/mna/6155-tests-lls-aggregation Adding unit tests for live location sharing aggregation code (PSF-1063)	2022-06-20 09:19:38 +02:00
Florian Renaud	398e98ae85	Remove useless variable	2022-06-18 00:49:28 +02:00
Florian Renaud	7ea2d0a86d	Delete the local rooms when the room list is shown	2022-06-18 00:49:24 +02:00
Florian Renaud	10d683ad5d	Start DM - display a local room before creating the real one Add CreateLocalRoomTask interface and remove DI annotations	2022-06-18 00:48:35 +02:00
Maxime NATUREL	ac4b33647d	Mutualizing some similar tests with different parameters	2022-06-17 17:55:43 +02:00
Maxime NATUREL	2c96179383	Renaming helpers to clarify purpose	2022-06-17 17:55:43 +02:00
Maxime NATUREL	e3981f42e9	Introducing FakeWorkManager	2022-06-17 17:55:43 +02:00
Maxime NATUREL	b9b1e2b397	Adding tests on location data aggregation	2022-06-17 17:55:43 +02:00
Maxime NATUREL	6386c1603f	Adding tests on beacon info aggregation	2022-06-17 17:55:43 +02:00
Maxime NATUREL	dccc3b457d	Adding more tests on ignored cases	2022-06-17 17:55:43 +02:00
Maxime NATUREL	51b930147a	Adding some tests on ignored cases	2022-06-17 17:55:43 +02:00
Benoit Marty	8238cd7f57	Merge pull request #6319 from vector-im/feature/bma/stateEventQuery Enforce query on state event	2022-06-16 17:13:17 +02:00
Benoit Marty	fe7515761a	Merge pull request #6300 from vector-im/feature/bma/flipper Setup Flipper	2022-06-16 16:44:05 +02:00
SpiritCroc	7e6565aefa	Do not exclude auto-space-added DMs from orphans in home Change-Id: I50dae52334d3a2473ff43e398a6448de652afc7f	2022-06-16 16:41:52 +02:00
Benoit Marty	3557121758	Fix test compilation	2022-06-16 14:13:03 +02:00
Adam Brown	7558d71ec2	removing extra blank line	2022-06-16 12:47:40 +01:00
Adam Brown	6a66125286	formatting	2022-06-16 11:19:14 +01:00
Adam Brown	30f5e2bb6c	adding test around matrix user id check	2022-06-16 11:18:38 +01:00
SpiritCroc	fd34eba596	Experimental: Allow sending custom emotes ("emojis") Using MSC2545 image packs TODO: - not use pills, or make them look differently here? - edits and drafts lose it note: upstream issue, same for user pills Change-Id: I27daf5835e32b818e512b61b57c09bea8c205e94	2022-06-16 09:51:58 +02:00
Benoit Marty	a4dd279352	Ensure we do not use `QueryStringValue.NoCondition` or `QueryStringValue.IsNull` to query for State Event. Also remove default value for those parameters.	2022-06-15 19:20:26 +02:00
Benoit Marty	0abeb3306e	Bad copy paste in comment	2022-06-15 16:14:20 +02:00
Benoit Marty	514c4234f2	Add MatrixConfiguration network interceptors after all the other, to ensure to view all the network request headers in Flipper.	2022-06-15 16:14:20 +02:00
Benoit Marty	e12103387d	Setup Flipper Move getLastSession() to the SessionManager Create `DebugService` Move `logDbUsageInfo()` to `DebugService`	2022-06-15 16:14:20 +02:00
ericdecanini	9766b62539	Fixes lint error	2022-06-15 16:00:00 +02:00
ericdecanini	7f3325e8df	Fixes wrong user id in search room summary item	2022-06-15 14:47:26 +02:00
ericdecanini	d40c2f8c78	Fixes migration error	2022-06-15 14:42:08 +02:00
ericdecanini	d5c5c5734f	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-06-15 14:22:24 +02:00
ericdecanini	385720b89d	Replaces flatten parents with direct parent name in RoomSummary	2022-06-15 11:46:57 +02:00
SpiritCroc	2ac877fe74	[TEST] Improve RR reliability Change-Id: Icfc371829dcbe9103cf4cad40c5371e83db8e23c	2022-06-14 18:39:14 +02:00
SpiritCroc	3058ee8f9e	Add more sync logging It looks like we're spending some time in the untimed area of the sync Change-Id: Ifa0fcccf5da74a72ab2b10491114a8a14a94a7ab	2022-06-14 18:38:47 +02:00
Adam Brown	ded7b1e0d0	updating current version	2022-06-14 15:16:56 +01:00
SpiritCroc	ff65f2d704	Merge tag 'v1.4.20' into sc Change-Id: I8d93dd3caa86ff7c68aacbd037dca60591ec254c	2022-06-14 10:06:37 +02:00
dependabot[bot]	eba52ea54f	Bump okhttp-bom from 4.9.3 to 4.10.0 Bumps [okhttp-bom](https://github.com/square/okhttp) from 4.9.3 to 4.10.0. - [Release notes](https://github.com/square/okhttp/releases) - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okhttp/compare/parent-4.9.3...parent-4.10.0) --- updated-dependencies: - dependency-name: com.squareup.okhttp3:okhttp-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-13 12:24:55 +00:00
Benoit Marty	4ea4990177	Merge remote-tracking branch 'origin/develop' into develop	2022-06-13 14:12:00 +02:00
Benoit Marty	aac2df85bb	Version++	2022-06-13 14:10:48 +02:00
Benoit Marty	d876690fc7	Merge branch 'hotfix/1.4.20' into develop	2022-06-13 14:08:49 +02:00
Onuray Sahin	eb49ceb803	Merge pull request #6280 from vector-im/feature/ons/live_location_sharing_report Add report action for live location messages [PSF-1067]	2022-06-13 14:23:11 +03:00
Benoit Marty	4fa8e70276	Prepare hotfix 1.4.20	2022-06-13 12:37:39 +02:00
ganfra	2a9ac539e4	Change after PR review	2022-06-13 12:35:39 +02:00
ganfra	c384a3de8d	Fix EventInsertLiveObserver gets blocked by reverting and adding lock instead	2022-06-13 12:35:20 +02:00
Nicolas Werner	75a6986770	Remove comment referencing msc2432 Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>	2022-06-13 09:57:33 +02:00
Nicolas Werner	d07557a5ee	Fix overlooked path as well Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>	2022-06-12 18:05:26 +02:00
Nicolas Werner	0c3ea4f923	Use stable endpoint for alias management This increases compatibility with homeservers and allows them to remove Element Android specific workaround. fixes #4830 see https://github.com/ruma/ruma/pull/936 see https://github.com/matrix-org/synapse/issues/8334 see https://github.com/matrix-org/synapse/pull/9224 Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>	2022-06-12 15:05:15 +02:00
dependabot[bot]	5689006c81	Bump libphonenumber from 8.12.49 to 8.12.50 Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.49 to 8.12.50. - [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.49...v8.12.50) --- 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-10 13:38:47 +00:00
dependabot[bot]	2d654da691	Bump realm-gradle-plugin from 10.9.0 to 10.11.0 Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.9.0 to 10.11.0. - [Release notes](https://github.com/realm/realm-java/releases) - [Changelog](https://github.com/realm/realm-java/blob/v10.11.0/CHANGELOG.md) - [Commits](https://github.com/realm/realm-java/compare/v10.9.0...v10.11.0) --- updated-dependencies: - dependency-name: io.realm:realm-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-10 13:25:27 +02:00
Onuray Sahin	d8947f5c0b	Add report action for live location messages.	2022-06-10 14:01:43 +03:00
ganfra	c0f3f394ac	Format ktlint	2022-06-09 11:14:49 +02:00
ganfra	87c1d69e26	Cancel verification flow if request sending fails (after retry)	2022-06-09 10:56:41 +02:00
ganfra	e5ce77de34	Use retry through executeRequest instead of Task.executeRetry	2022-06-09 10:55:59 +02:00
SpiritCroc	6344a3982d	Merge remote-tracking branch 'origin/merge-v1.4.19' into sc Change-Id: Idbdbece462fff520912ab0f356a74585989d6d14	2022-06-08 14:35:25 +02:00
ericdecanini	87053f2c70	Reformats after merging	2022-06-08 13:01:26 +02:00
ericdecanini	6df88fba59	Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/GroupSyncHandler.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt # vector/src/main/java/im/vector/app/features/home/HomeActivity.kt # vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt # vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.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/style/TimelineMessageLayoutFactory.kt # vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt	2022-06-08 12:59:54 +02:00
ganfra	52ed7c019b	Merge pull request #12 from poljar/fga/feature/finish_backup_recovery_key Use backup key directly on olmMachine.	2022-06-08 12:29:43 +02:00
Benoit Marty	3b2f9d9404	Merge pull request #6029 from vector-im/feature/bma/sdk_sync_service Feature/bma/sdk sync service	2022-06-08 11:58:38 +02:00
Adam Brown	a4721033c8	Merge pull request #6229 from vector-im/dependabot/gradle/org.matrix.android-olm-sdk-3.2.12 Bump olm-sdk from 3.2.11 to 3.2.12	2022-06-08 10:04:08 +01:00
Benoit Marty	1bad8f7741	Introduce `SessionState` to be able to check the Session state from several places.	2022-06-08 09:55:28 +02:00
Benoit Marty	de960116b3	Rename internal fun.	2022-06-08 09:55:28 +02:00
Benoit Marty	dd22cdf7f2	Rename existing SyncService to SyncAndroidService to avoid confusion	2022-06-08 09:55:28 +02:00
Benoit Marty	f62d598b79	Create a SyncService and move some methods from Session there. Merge SyncStatusService to SyncService, and rename some classes	2022-06-08 09:53:33 +02:00
Maxime NATUREL	73568dbc86	Merge pull request #6212 from vector-im/fix/mna/6209-wrong-live-status Fix wrong status of live location sharing in timeline (PSF-1073)	2022-06-08 09:40:33 +02:00
Benoit Marty	c290dd6c1d	Merge branch 'develop' into task/eric/when-arrow-alignment	2022-06-07 23:03:36 +02:00
ganfra	b6d73d872b	Use backup key directly on olmMachine.	2022-06-07 19:57:44 +02:00
Adam Brown	462d3071de	Merge pull request #6171 from vector-im/feature/adm/sdk-new-password-on-confirmation [SDK] Allow passwords to be set at the point of reset confirmation	2022-06-07 16:43:28 +01:00
SpiritCroc	de179f1d29	Merge tag 'v1.4.19' into merge-v1.4.19 Change-Id: Id486dab5c9b6c545e7035355fe921240c34409a6	2022-06-07 15:33:53 +02:00
Benoit Marty	26dcc9bc52	Merge hotfix 1.4.19 into develop	2022-06-07 15:14:29 +02:00
Benoit Marty	b2f67f971b	Prepare v1.4.19	2022-06-07 15:11:46 +02:00
Valere	a6113526d0	code review	2022-06-07 15:01:57 +02:00
Valere	2fa25f8b5e	Fix param name	2022-06-07 15:01:29 +02:00
Valere	d67f86a1e0	fix slow paged room list	2022-06-07 15:00:54 +02:00
Michael Kaye	10125f4738	Merge pull request #6111 from vector-im/michaelk/sonarqube_fixes Sonarqube including coverage on each PR.	2022-06-07 09:44:00 +01:00
Michael Kaye	c2ac07b1c9	Fix ktlint error	2022-06-06 18:56:05 +01:00
Michael Kaye	56608d564e	Retry ALL THE THINGS, and always send sonarqube	2022-06-06 17:08:02 +01:00
Adam Brown	0ef67b6b64	Merge pull request #6214 from vector-im/feature/adm/homeserver-version-parsing Homeserver version without patch number parsing	2022-06-06 14:54:32 +01:00
ganfra	abee136867	Ktlint and format	2022-06-06 15:45:06 +02:00
ganfra	327ac2e17b	Ignore some failing tests because because using incompatible or unavailable method now.	2022-06-06 15:38:50 +02:00
Adam Brown	fa21b6d224	creating generic extension for converting empty strings to null and making use for finding option regex match	2022-06-06 14:16:01 +01:00
Adam Brown	edfabb0f26	adding missing loading state when confirming password reset - adds reset test cases to the onboarding view model	2022-06-06 13:59:34 +01:00
Adam Brown	cc8f17b786	moving the reset password new password to the reset confirmation step - the new password is moved to the in memory view model state	2022-06-06 13:57:59 +01:00
Adam Brown	35163f77ba	allow passing the new password when resetting passwords either upfront or as part of the confirmation step	2022-06-06 13:57:59 +01:00
ganfra	705788394b	Fix some more E2EE tests	2022-06-06 14:54:19 +02:00
ganfra	c1961d1fda	DeviceId should be non-null so we can inject it properly and OlmMachine too.	2022-06-06 14:53:56 +02:00
SpiritCroc	a1e6e50ad4	Raise sync timing log level Change-Id: I6b7d98675c2a5d03510d357ea147d46d35f5a903	2022-06-05 12:46:35 +02:00
ericdecanini	7d8590d85f	Disables when arrow alignment post merge with develop	2022-06-03 12:14:47 +02:00
ericdecanini	5cc7deea4e	Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.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/worker/MatrixWorkerFactory.kt # vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt # vector/src/main/java/im/vector/app/core/utils/TextUtils.kt # vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt # vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.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/HomeDetailFragment.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/timeline/factory/LiveLocationShareMessageItemFactory.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/RoomListSectionBuilderSpace.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt # vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt # vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt	2022-06-03 12:06:23 +02:00
ericdecanini	f6b0e8d13c	Adds isUpgraded method to VersioningState	2022-06-03 12:02:50 +02:00
dependabot[bot]	941d5844b5	Bump olm-sdk from 3.2.11 to 3.2.12 Bumps olm-sdk from 3.2.11 to 3.2.12. --- updated-dependencies: - dependency-name: org.matrix.android:olm-sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-03 01:03:37 +00:00
ganfra	14ed4692dc	Merge branch 'rust' into feature/fga/device_verification	2022-06-02 15:42:25 +02:00
ganfra	022057dd6f	Merge pull request #10 from poljar/feature/fga/backup_recovery_key Feature/fga/backup recovery key	2022-06-02 15:39:10 +02:00
ganfra	eb0faa3484	Fix some E2E tests	2022-06-02 15:38:28 +02:00
ganfra	47bc597b99	OKHttp: rise maxRequestsPerHost to 64 (instead of default 5)	2022-06-02 15:38:19 +02:00
ganfra	797dc9ccbb	Crypto: fix tracking onRoomMembershipEvent	2022-06-02 15:36:06 +02:00
Adam Brown	4f8aedb038	moving and updating duplicated service function doc	2022-06-01 16:48:10 +01:00
Adam Brown	b0c294b41b	avoiding resetting pending state when starting a new login flow - fixes selecting a incorrect homeserver and returning to the previous login page also failing	2022-06-01 16:48:10 +01:00
Adam Brown	10016fcb15	using correct license for matrix sdk class	2022-06-01 13:45:59 +01:00
SpiritCroc	49663a1154	Merge tag 'v1.4.18' into sc Change-Id: I58667aa99a8eb99b0b1e7f0784d811061c2086a5 Conflicts: dependencies.gradle library/attachment-viewer/build.gradle matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.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/summary/RoomSummaryDataSource.kt vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt vector/src/main/java/im/vector/app/AppStateHandler.kt vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt vector/src/main/java/im/vector/app/core/utils/Emoji.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/timeline/item/MessageImageVideoItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.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/RoomSummaryItemFactory.kt vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt vector/src/main/res/xml/vector_settings_labs.xml	2022-06-01 13:54:34 +02:00
Adam Brown	3756b2d240	adding trailing commas to lists	2022-06-01 10:44:23 +01:00
Adam Brown	4501c7cf45	adding test case for trailing . on the version	2022-06-01 10:44:10 +01:00
Adam Brown	289ce7419d	supporting homeserver versions without a patch value	2022-06-01 10:41:37 +01:00
Adam Brown	ea151b37f0	adding test cases around parsing homeserver versions	2022-06-01 10:41:37 +01:00
Benoit Marty	8e709dbbdb	Merge pull request #5528 from SpiritCroc/chunk-modification-issue Fix missing/swapped/duplicated messages due to wrong TimelineChunk modifications or insertions	2022-05-31 18:24:08 +02:00
Benoit Marty	884525bef0	Merge pull request #6125 from vector-im/task/eric/code-style-parenthesis Code Style - New line before and after method parentheses	2022-05-31 18:17:07 +02:00
Benoit Marty	1c73e28226	Version++	2022-05-31 17:58:09 +02:00
ganfra	c253f6b06f	Clean more code	2022-05-31 16:16:56 +02:00
Maxime NATUREL	b1750c1c21	Adding log in worker	2022-05-31 15:56:36 +02:00
Maxime NATUREL	102684ed88	Fixing aggregation process	2022-05-31 15:56:23 +02:00
ericdecanini	8af49891ff	Post merge conflict reformatting	2022-05-31 14:23:02 +02:00
ericdecanini	e6e05317e1	Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis # Conflicts: # matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt # vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt	2022-05-31 14:21:16 +02:00
ganfra	3e116ad065	Add RequestDeviceVerification method	2022-05-30 19:55:48 +02:00
ganfra	466260bc6a	Fix one test and ignore another one	2022-05-30 19:55:37 +02:00
Benoit Marty	ae94f45f34	Merge pull request #5952 from vector-im/feature/bma/sdk_user_story Sdk user story	2022-05-30 18:30:56 +02:00
SpiritCroc	0393dd51c9	Bring back downstream "Update room previews once we have decryption keys" This reverts commit `130fe7f887`. Also update to some newer decryption logic, and disable the new upstream logic, to avoid duplicate decryption attempts. Change-Id: Ibcea8b825d94284dfcf2d305b5f57423366601e5	2022-05-30 17:39:20 +02:00
Benoit Marty	0806e7358a	Merge pull request #5780 from ofalvai/dependency-cleanup Remove unused dependencies	2022-05-30 15:41:10 +02:00
Maxime NATUREL	eeaf9fd616	Merge pull request #6129 from vector-im/feature/mna/PSF-1019-user-pins [Location sharing] - Show user live location pins in map view (PSF-1019)	2022-05-30 12:32:09 +02:00
Benoit Marty	c071dc502e	Create extension `String?.toActiveSpaceOrOrphanRooms()` to reduce noise.	2022-05-30 11:38:31 +02:00
Benoit Marty	ad60467ae7	Fix test compilation	2022-05-30 11:38:03 +02:00
Benoit Marty	cffdb7f7a6	Add some Kdoc	2022-05-30 11:38:03 +02:00
Benoit Marty	5fbcec0c9c	Add some Kdoc	2022-05-30 11:34:55 +02:00
Benoit Marty	0b6f35b256	Create SpaceFilter.OrphanRooms to improve the API. Not 100% of the side effect. There is probably some (fixed?) bugs here.	2022-05-30 11:34:55 +02:00
Benoit Marty	c7997edf9a	Rename ActiveSpaceFilter to SpaceFilter	2022-05-30 11:34:55 +02:00
Benoit Marty	00809027c1	Remove `ActiveSpaceFilter.None` Prefer nullability for API coherency of `RoomSummaryQueryParams`	2022-05-30 11:34:55 +02:00
Benoit Marty	289f27b738	Add some Kdoc	2022-05-30 11:34:55 +02:00
Benoit Marty	3442829e11	Remove duplicated lines of code (the same code is done a few lines later)	2022-05-30 11:34:55 +02:00
Benoit Marty	8843fe0a54	Remove `RoomCategoryFilter.ALL` Prefer nullability for API coherency of `RoomSummaryQueryParams`	2022-05-30 11:34:55 +02:00
Benoit Marty	8d7a54a6cf	`displayName` default value is now `QueryStringValue.NoCondition`. It was working fine since in the DB we always have a name using `RoomDisplayNameFallbackProvider`, which in our current implementation always return a non empty String.	2022-05-30 11:34:55 +02:00
Benoit Marty	2b0077b138	Small rework for nicer code	2022-05-30 11:34:55 +02:00
Benoit Marty	bfdc885d7f	Remove `roomId` from `RoomSummaryQueryParams.Builder()`. Create a new API in RoomService to observe a room summary from a roomId.	2022-05-30 11:34:55 +02:00
Benoit Marty	49a29fb56f	Always use `roomSummaryQueryParams`, and not directly a `RoomSummaryQueryParams.Builder()` Also format and add some Kdoc	2022-05-30 11:34:55 +02:00
Benoit Marty	12b3afbc50	Always use `roomSummaryQueryParams`, and not directly a `RoomSummaryQueryParams.Builder()` Also format and add some Kdoc	2022-05-30 11:34:55 +02:00
Eric Decanini	eeb7d60e59	Merge pull request #5860 from vector-im/feature/eric/replace-search-room-subheader Replaces subtitle in Search Rooms with room context rather than last event	2022-05-30 11:13:10 +02:00
Adam Brown	d18e7ad001	Merge branch 'develop' of github.com:vector-im/element-android into michaelk/sonarqube_fixes	2022-05-30 10:07:43 +01:00
Adam Brown	ead189a9c7	temporarily ignoring flaky test when ran on the CI	2022-05-30 09:37:39 +01:00
Maxime NATUREL	066c540eb7	Filter event id in the DB query for active lives	2022-05-30 10:06:04 +02:00
Maxime NATUREL	f707f177d9	Improving mapper tests	2022-05-30 10:03:27 +02:00
dependabot[bot]	c6751f00ab	Bump libphonenumber from 8.12.48 to 8.12.49 Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.48 to 8.12.49. - [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.48...v8.12.49) --- 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-05-27 23:07:12 +00:00
ericdecanini	a5dc8ec181	Only gets flattenParents if specifically requested	2022-05-27 15:05:39 +02:00
Valere	c8b44bfd4c	fix test post rebase	2022-05-27 10:17:40 +02:00
Olivér Falvai	9ce9ad6d3a	Merge remote-tracking branch 'origin/develop' into dependency-cleanup	2022-05-26 14:04:39 +02:00
Valere	5735b094ac	post rebase fix	2022-05-25 18:41:37 +02:00
Valere	e1292c03a1	code review	2022-05-25 18:40:33 +02:00
Valere	adb5b4c1b9	Fix closing deactivated accounts in tests	2022-05-25 18:40:33 +02:00
Valere	3332d827f0	rename testHelpers and make constructor private	2022-05-25 18:40:33 +02:00
Valere	29ff4d1e84	use withTestHelpers in sanity tests	2022-05-25 18:40:33 +02:00
Valere	e18402f834	Improve test stability	2022-05-25 18:40:33 +02:00
ericdecanini	927f526c6c	Post merge conflict reformatting	2022-05-25 17:35:54 +02:00
ericdecanini	8647400dda	Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt	2022-05-25 17:35:31 +02:00
Valere	d7c8abbe98	quick format	2022-05-25 16:52:56 +02:00
Valere	abb335c43d	Improve redaction test	2022-05-25 16:52:56 +02:00
Valere	136d2e330a	added change log	2022-05-25 16:52:56 +02:00
Valere	755da616ed	Fix decrypting redacted event	2022-05-25 16:52:56 +02:00
Valere	52eb48d808	Merge pull request #6077 from vector-im/feature/aris/crypto_replay_attack Feature/aris/crypto replay attack	2022-05-25 16:20:26 +02:00
Michael Kaye	9f4f3f482c	Merge branch 'develop' into michaelk/sonarqube_fixes	2022-05-25 14:22:10 +01:00
Michael Kaye	f5b4e897fa	Merge pull request #6099 from vector-im/michaelk/retry_keys_backup_test Track number of retries of tests,retry KeysBackupTest, Ignore E2eeSanityTests	2022-05-25 14:16:47 +01:00
ganfra	b0aae84727	Use BackupRecoveryKey instead of plain string	2022-05-25 14:45:31 +02:00
ganfra	7c76ba8184	Create BackupRecoveryKey wrapper class (to avoid directly expose uniffi generated classes)	2022-05-25 14:45:16 +02:00
ganfra	b57dfee77e	Rename RequestProcessor	2022-05-25 14:44:23 +02:00
ganfra	1809d02541	Temporary fix tests (wait for rust)	2022-05-25 14:42:03 +02:00
Michael Kaye	ba109a486f	Update to build scripts to enable sonarqube reporting including coverage.	2022-05-25 13:35:40 +01:00
Maxime NATUREL	eda0aa97d0	Fixing code quality issues	2022-05-25 14:11:18 +02:00
Maxime NATUREL	33151eef73	Move the default implementation of location sharing service into internal package	2022-05-25 14:05:14 +02:00
Maxime NATUREL	8d2debf47e	Adding missing ending dots in comments	2022-05-25 14:05:14 +02:00
Maxime NATUREL	1b8440d7c8	Removing unused imports	2022-05-25 14:05:14 +02:00
Maxime NATUREL	095cc12e10	Fixing unit tests of the mapper	2022-05-25 14:05:14 +02:00
Maxime NATUREL	d9480bb136	Adding todo to add unit tests on aggregation process	2022-05-25 14:05:14 +02:00
Maxime NATUREL	5efe26c7dd	Fix code quality issues	2022-05-25 14:05:14 +02:00
Maxime NATUREL	c07bc0890f	WIP - unit tests	2022-05-25 14:05:14 +02:00
Maxime NATUREL	79212321a2	Deactivate all previous active beacons when receiving one from user	2022-05-25 14:05:12 +02:00
Maxime NATUREL	bec3f793f3	Improve query of current running live location shares	2022-05-25 14:04:22 +02:00
Maxime NATUREL	ca9591e423	Fix set of userId in aggregation process	2022-05-25 14:04:22 +02:00
Maxime NATUREL	3b06f18ccb	Remove unused imports	2022-05-25 14:04:22 +02:00
Maxime NATUREL	7a7af40d61	Creation of LocationSharingService to get current users sharing their live locations	2022-05-25 14:04:20 +02:00
Michael Kaye	c59c5cfb4a	Ignore all tests that have failed during testing.	2022-05-25 12:36:21 +01:00
Maxime NATUREL	791d4fb1e8	Improve computation of the work name to limit its length	2022-05-25 11:10:54 +02:00
Maxime NATUREL	8864a3cf2c	Using replace instead of keep strategy for the worker	2022-05-25 11:06:02 +02:00
Maxime NATUREL	cfdc18d421	Improve code readability in aggregation processor	2022-05-25 11:05:28 +02:00
Maxime NATUREL	b081429725	Replace getOrCreate() by get() in worker	2022-05-25 10:59:08 +02:00
ericdecanini	c3209d7049	Manually fixes more formatting issues	2022-05-24 15:31:20 +02:00
ericdecanini	6c21a6b48d	Separates some method parameters	2022-05-24 15:26:24 +02:00
SpiritCroc	a2486fccf5	Do not fully discard chunks that start with duplicate events If we already have some events in a previously linked chunk, that doesn't mean we have all of them. So we still want to continue processing later events in that case. Change-Id: I95e864ad7e786ea71b9facdbbf52c2685b36ee26	2022-05-24 11:54:21 +02:00
SpiritCroc	d3addc24f1	Add some missing log spaces Change-Id: I36cfbaa49f1e7703d23eacefeeafda380eb99e65	2022-05-24 11:53:38 +02:00
Maxime NATUREL	683a9cdfff	Schedule work during aggregation	2022-05-23 17:34:52 +02:00
Maxime NATUREL	47eb7173f0	Creation of a worker to deactivate a live after timeout	2022-05-23 17:34:52 +02:00
Maxime NATUREL	d76b93ced3	Adding comment on isActive field	2022-05-23 17:34:51 +02:00
ericdecanini	b3fdb5ed17	Changes code style when arrow alignment	2022-05-23 12:57:57 +02:00
ericdecanini	3f3662e605	Changes code style method parameters new line around parentheses to true	2022-05-23 12:30:42 +02:00
SpiritCroc	a95e41056d	Improve room preview generation - Also look into past chunks for previewable events - Better timestamp guesses if not enough history loaded yet - Update missing previews when more chunks loaded Change-Id: I27a420b9564e091db0e322751c798e205e26fd47	2022-05-22 20:26:25 +02:00
SpiritCroc	8a1da1c02f	Avoid mismatch between hasUnread and notificationCount because of unreadCount With MSC2654 unread counts, it is possible such count is zero while the notification count isn't. So also respect the notification count when deciding if a chat has unread messages. Change-Id: I1b9f6ae907eb468c27fc0bb75b711db04268560a	2022-05-22 13:12:46 +02:00
SpiritCroc	c214e5daf1	Avoid missing timestamps due to missing previewable event Just use a non-previewable event instead. Improves sorting of the room list: don't drop rooms to the bottom because of too much un-previewable activity. Change-Id: Ib1ad8050caae85a3e7c8a686c2fa63a2924db890	2022-05-22 12:23:11 +02:00
Benoit Marty	53c83ab8d8	Add missing punctuation	2022-05-20 21:22:47 +02:00
Benoit Marty	92d54dc733	Fix compilation issue	2022-05-20 21:14:42 +02:00
Benoit Marty	b86693580e	`class` with `private constructor` instead of `object`	2022-05-20 21:14:42 +02:00
Benoit Marty	827c7e58f6	Package have been renamed, so also rename it here. Dokka does not complain about unknown package in this file :/	2022-05-20 21:14:42 +02:00
Benoit Marty	8218d8f267	Typo: isStucked -> isStuck	2022-05-20 21:14:42 +02:00
Benoit Marty	8d74acf060	Fix post rebase issue	2022-05-20 21:14:42 +02:00
Benoit Marty	dc1eba2847	Improve documentation	2022-05-20 21:14:42 +02:00
Benoit Marty	d92875e3c2	Improve documentation	2022-05-20 21:14:42 +02:00
Benoit Marty	740acda60b	Please ktlint. Ok, the user story will appear at the end of the doc.	2022-05-20 21:14:42 +02:00
Benoit Marty	853c0a25bf	Method `onSecretKeyGossip` doe snot have to be in the public interface	2022-05-20 21:14:42 +02:00
Benoit Marty	ede784684f	Change in KeysBackupService: `isEnabled` and `isStucked` are now fun, and `state` has been renamed to `getState` and is now a fun.	2022-05-20 21:14:42 +02:00
Benoit Marty	1ab4ae9eac	Extract KeyRef to its own file	2022-05-20 21:14:42 +02:00
Benoit Marty	d3d17ebbcb	Extract HttpPusher to its own file	2022-05-20 21:14:42 +02:00
Benoit Marty	768df330b5	Rename `currentThreePid` to `getCurrentThreePid`	2022-05-20 21:14:42 +02:00
Benoit Marty	e6c8ffd1b8	Change `val` to `fun` on the SDK interfaces. Dokka will generate a better documentation (`Functions` and `Properties` are 2 distinct tab), and for Service it's better to have only `fun`	2022-05-20 21:14:42 +02:00
Benoit Marty	cfd6456614	Add other user stories (with TODO)	2022-05-20 21:14:42 +02:00
Benoit Marty	96c825e265	Create _userstories package and add the 2 first user stories	2022-05-20 21:14:42 +02:00
Benoit Marty	bad62be497	Use Kdoc format, else it's not extracted to the documentation by dokka	2022-05-20 21:14:42 +02:00
ariskotsomitopoulos	85f3592938	PR remarks	2022-05-20 17:03:15 +03:00
ariskotsomitopoulos	1bea28e27a	fix documentation format	2022-05-20 16:03:39 +03:00
ariskotsomitopoulos	e323caa233	Merge branch 'develop' into feature/aris/crypto_replay_attack # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt	2022-05-20 15:46:15 +03:00
ariskotsomitopoulos	c958d3a383	Merge branch 'develop' into feature/aris/crypto_replay_attack	2022-05-20 15:43:08 +03:00
ariskotsomitopoulos	7bc880e6bf	Improve documentation	2022-05-20 15:33:29 +03:00
ganfra	58a1c80334	Fix crash on on crypto store open/close	2022-05-20 12:47:47 +02:00
ariskotsomitopoulos	2081e2c45b	Reduce log visibility to verbose	2022-05-20 13:32:55 +03:00
Benoit Marty	4094a66f3c	Merge pull request #6084 from vector-im/feature/bma/detekt_outdated_doc Feature/bma/detekt outdated doc	2022-05-20 12:06:34 +02:00
ganfra	21ef138e97	Add more logs on verif	2022-05-20 11:21:51 +02:00
Benoit Marty	b547a49ab3	Merge pull request #6089 from vector-im/feature/bma/real_fail Ensure calling 'fail()' is not caught by the Exception handler	2022-05-20 10:33:02 +02:00
Benoit Marty	f5d0663b06	Remove non needed extra spaces	2022-05-20 09:48:17 +02:00
Benoit Marty	dae0b66c90	PR review	2022-05-20 09:48:05 +02:00
Benoit Marty	51fe7b9a93	Detekt: Fix OutdatedDocumentation	2022-05-20 09:48:05 +02:00
Benoit Marty	2a66e03742	Kdoc: remove unnecessary `:`	2022-05-20 09:47:54 +02:00
SpiritCroc	088657168f	Avoid missing messages when trying to add event to chunk twice Change-Id: I98ae8e7a5254e6f93fd2a38498b7f8e173ccd565	2022-05-19 22:36:02 +02:00
Michael Kaye	a4fa65b4fd	Fix linting	2022-05-19 12:37:41 +01:00
Michael Kaye	fe793798fa	Ignore E2eeSanityTests. They fail infrequently, but in a way that takes the entire test framework down, so ignore them for now and open an issue to fix.	2022-05-19 12:06:54 +01:00
Onuray Sahin	9adbeb8dd2	Fix import.	2022-05-19 14:04:37 +03:00
Onuray Sahin	1605ae1607	Merge branch 'develop' into feature/ons/poll_refactoring * develop: (251 commits) Space explore rooms screen alignment with design in figma (#5834) leaving space aligned with ios (#5942) Fix usage of System.currentTimeMillis(). This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case. Update TimelinePreviousLastForwardTest.kt Changelog.d Rename 'getDomain' to 'getServerName'. Well-known lookups should not include the port of a server. Ah it was used in Gplay variant. Anyway I think we can still remove this now. Fix parsing of location data in non encrypted room Additionally increment for TimelinePreviousLastForwardTest Notify other devices of acceptance of verification request Instead of using a magic number, explicitly test for the events we expect. Adding comments on some strings and removing non necessary plural Remove ShortcutBadger lib and usage (it was dead code) Version++ Fastlane file Towncrier Add `.login` to get the username of the PR merger. Rename folder for the PlayStore Remove empty translations ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt	2022-05-19 13:39:43 +03:00
Olivér Falvai	f036d35829	Merge branch 'develop' into dependency-cleanup	2022-05-19 12:27:09 +02:00
Michael Kaye	28c4abb505	Track number of retries of tests, and retry KeysBackupTest	2022-05-19 10:34:38 +01:00
ganfra	42e5dcd50a	Use release version 0.1.0 of crypto rust component	2022-05-18 19:01:57 +02:00
ganfra	f559db62b9	Fix tests compilation	2022-05-18 18:48:37 +02:00
Michael Kaye	5260e729ac	Merge pull request #6095 from vector-im/michaelk/correct_well_known_behaviour Well known lookups should be to port 443 only.	2022-05-18 16:50:43 +01:00
Michael Kaye	d57841c0d0	Merge pull request #6088 from vector-im/michaelk/fix_forward_pagination_test In TimelineForwardPaginationTest, explicitly test for the events we expect	2022-05-18 16:50:09 +01:00

... 13 14 15 16 17 ...

6730 commits