mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-23 18:05:36 +03:00
Code Issues Projects Releases Packages Wiki Activity
20334 commits 161 branches 158 tags 270 MiB
Commit graph

5605 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Adam Brown
ded7b1e0d0 updating current version 2022-06-14 15:16:56 +01: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