Commit Graph

5886 Commits

Author SHA1 Message Date
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
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
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
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