Commit Graph

5619 Commits

Author SHA1 Message Date
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
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
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
Benoit Marty 2c63dee86a Avoid trying to log formatted Json if Http bodies are not logged. 2022-08-24 10:16:57 +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
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
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 3845e1435c Fix cleartext leak in log
Change-Id: Ifb9faaa52f63bcf9c88a8499c2b078dd1a2de62e
2022-08-01 13:00:30 +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
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
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 19fc97ba0f Use executeTransactionAwait (need realm refresh in this case) 2022-07-06 19:33:34 +02: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
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