Commit Graph

5332 Commits

Author SHA1 Message Date
ericdecanini
b12549831e 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/db/SessionParamsMapper.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
#	vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
2022-05-17 14:24:35 +02:00
Onuray Sahin
4c079cc0ac Write unit tests for poll end event aggregation. 2022-05-17 14:59:14 +03:00
Onuray Sahin
00e800459d Write unit tests for poll response event aggregation. 2022-05-17 14:13:38 +03:00
Michael Kaye
868c33a8b4 Correct var -> val for @get:Rules 2022-05-17 12:12:49 +01:00
Michael Kaye
1f89cfbe44 Lint fixes 2022-05-16 16:55:36 +01:00
Michael Kaye
a19c1d6fbe Make test consistent wiht assert message. 2022-05-16 16:01:21 +01:00
Michael Kaye
096cf9272a Rather than ignore them, put tests on a retry loop.
I'm reliably getting passing tests locally with just these ignores.
2022-05-16 16:01:15 +01:00
Michael Kaye
8950aa38ea Address repeated initializatin of WorkManagerImpl in #5887 2022-05-16 16:01:09 +01:00
Michael Kaye
4ced6ca179 Fix linting error. 2022-05-16 15:59:41 +01:00
Michael Kaye
fa26e2a23e Revert "@Ignore all tests currently failing in CI"
This reverts commit 8d234b4b65a7a899abdeed9c5167a8c09c9af3e0.
2022-05-16 15:59:41 +01:00
Michael Kaye
70682b4931 Increase timeout. Log timeout. 2022-05-16 15:59:41 +01:00
Michael Kaye
78140af3f3 Crypto tests are failing due to slow initialSync. Increase timeout by 60s. 2022-05-16 15:59:41 +01:00
Michael Kaye
e06682dcda @Ignore all tests currently failing in CI 2022-05-16 15:59:41 +01:00
Benoit Marty
afd2804ed3
Merge branch 'develop' into feature/mna/PSF-884-location-view 2022-05-16 14:42:38 +02:00
Onuray Sahin
4065bce47a Write unit tests for poll start event aggregation. 2022-05-16 15:05:17 +03:00
Benoit Marty
12eb23b198
Merge branch 'develop' into feature/bma/detekt_end_period 2022-05-16 13:14:37 +02:00
Benoit Marty
dcbc85484c Remove ambiguity 2022-05-16 13:05:26 +02:00
Benoit Marty
0ed647d379 Add missing end period. 2022-05-16 12:25:10 +02:00
Benoit Marty
1eb97f6cb8 Disable the undocumented warnings, there are too many :/ 2022-05-16 12:23:10 +02:00
Benoit Marty
dfe75de76e Add links to the doc (I've finally found a way to do it) 2022-05-16 12:23:10 +02:00
Benoit Marty
26e6d56cf1 Improve doc 2022-05-16 12:23:10 +02:00
Benoit Marty
6f29a7ab94 Also update TextMatrix 2022-05-16 12:23:10 +02:00
Benoit Marty
08c67eaf0e Remove unecessary indirection 2022-05-16 12:23:10 +02:00
Benoit Marty
3fc4083aca Make the constructor public 2022-05-16 12:23:10 +02:00
Benoit Marty
11e1fdf332 Remove the deprecated way to create a Matrix object 2022-05-16 12:23:10 +02:00
Benoit Marty
92c0d97110 Rename API 2022-05-16 12:22:18 +02:00
Benoit Marty
7040369529 Add documentation to the class Matrix 2022-05-16 12:22:18 +02:00
ariskotsomitopoulos
2e08c07dad Enhance decryption to prevent DUPLICATED_MESSAGE_INDEX when decrypting the same eventId
Improve code format
2022-05-16 13:05:38 +03:00
Benoit Marty
90035de5f2
Merge pull request #6047 from chagai95/add-presence-indicator-busy-and-away
add presence indicator busy and away
2022-05-16 11:26:11 +02:00
ericdecanini
83bd9bca86 Fixes lint error 2022-05-16 10:31:16 +02:00
Maxime NATUREL
4a2310954a Removing non necessary LiveLocationAggregationProcessor interface 2022-05-16 10:11:14 +02:00
Benoit Marty
4c95aafe10 Detekt: enable and fix EndOfSentenceFormat 2022-05-16 08:54:07 +02:00
Benoit Marty
9234c60155
Merge pull request #6038 from vector-im/feature/bma/detekt
Detekt
2022-05-13 23:40:53 +02:00
ericdecanini
50839c206b Adds flattenParents field to RoomSummary and corresponding mapping 2022-05-13 20:43:03 +02:00
chagai95
9f033ed623
add presence indicator busy and away 2022-05-13 13:55:10 +02:00
Onuray Sahin
47f43a88f4 Create dummy poll event for tests. 2022-05-13 14:04:33 +03:00
Onuray Sahin
85708b7c60 Fix related event id. 2022-05-13 12:59:41 +03:00
Valere
7d5570fd6f quick format 2022-05-13 09:36:42 +02:00
Benoit Marty
03ec9946ff Detekt: fix ConstructorParameterNaming
UserProperties fix is also in https://github.com/matrix-org/matrix-analytics-events/pull/62
2022-05-12 22:17:56 +02:00
Valere
8077406cba code review 2022-05-12 18:45:35 +02:00
Valere
5a323db7dc Unignore and improve tests 2022-05-12 18:45:35 +02:00
Valere
b25b30719a Add test to check MSK signature on backup 2022-05-12 18:45:35 +02:00
Valere
22e0506814 Prevent 4S / megolm backup desync + sign with MSK 2022-05-12 18:45:35 +02:00
Benoit Marty
c3b5ba5639 Detekt: fix MatchingDeclarationName 2022-05-12 17:44:44 +02:00
Benoit Marty
3bc84f0d38 Detekt: fix MaxLineLength
@ouchadam your test fun names are too long!
2022-05-12 17:38:49 +02:00
Benoit Marty
aeb6495253 Detekt: fix RethrowCaughtException 2022-05-12 17:32:00 +02:00
Benoit Marty
21904054a5 Detekt: ignore EmptyCatchBlock 2022-05-12 17:29:10 +02:00
Benoit Marty
a09e893a0b Detekt: fix MayBeConst 2022-05-12 17:24:15 +02:00
Benoit Marty
824f029e20 "TODO:" is forbidden by Detekt 2022-05-12 17:06:52 +02:00
Onuray Sahin
817428e295 Refactor ending polls. 2022-05-12 17:53:08 +03:00
Ahmed Radhouane Belkilani
6a523ccc38 Allow using the latest user avatar and display name for all messages in the timeline
Signed-off-by: Jorge Martín Espinosa <jorgem@element.io>
2022-05-12 15:43:20 +02:00
ericdecanini
52c404ac9c Merge remote-tracking branch 'origin/develop' into feature/eric/replace-search-room-subheader 2022-05-12 14:36:04 +02:00
Onuray Sahin
704e86d843 Refactor editing polls. 2022-05-12 12:22:27 +03:00
Benoit Marty
deb0f1ad1b
Merge pull request #6000 from vector-im/dependabot/gradle/androidx.preference-preference-ktx-1.2.0
Bump preference-ktx from 1.1.1 to 1.2.0
2022-05-11 16:17:17 +02:00
Benoit Marty
a963596a59
Merge pull request #6022 from vector-im/feature/bma/gh_pages
Gh pages
2022-05-11 14:28:19 +02:00
Valere
304cb07858
Merge pull request #5559 from vector-im/feature/bca/crypto_better_key_share
Update/Revise SDK to implement reference flowchart for key sharing/forwarding + use backup
2022-05-11 12:05:58 +02:00
Valere
3948f263df fix method visibility 2022-05-11 11:16:00 +02:00
Benoit Marty
27dcb6ef9c Add a note when generated from this project.
A change will have to be done on the SDK project to remove this line before generated the documentation.
2022-05-11 11:14:45 +02:00
Valere
992f477ab1 use clock time instead of system 2022-05-11 10:58:13 +02:00
Valere
546d6fe56d post merge fix 2022-05-11 10:42:02 +02:00
Benoit Marty
ff386c3de6 Fix lint internal issue: remove object Params.
GetTurnServerTask.kt: Error: Unexpected failure during lint analysis of GetTurnServerTask.kt (this is a bug in lint or one of the libraries it depends on)
2022-05-11 10:22:07 +02:00
Travis Ralston
019ec6c1c8
Merge pull request #5997 from vector-im/travis/spec/v1.3-edit/nothreads
Remove spec v1.3 check for threads
2022-05-10 14:47:48 -06:00
Travis Ralston
8570a1e0ad Fix missed test 2022-05-10 14:05:06 -06:00
Valere
12ab4787f1 Merge branch 'develop' into feature/bca/crypto_better_key_share 2022-05-10 19:30:52 +02:00
Benoit Marty
04cadb94cf
Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
2022-05-10 18:23:51 +02:00
Benoit Marty
a3b6bb3ec3 Fix test compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 17:46:59 +02:00
Benoit Marty
f54aa60803 Fix test compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 17:00:54 +02:00
Benoit Marty
67cd82385a Fix warning: w: '-Xopt-in' is deprecated and will be removed in a future release, please use -opt-in instead 2022-05-10 16:07:24 +02:00
Benoit Marty
5c7ee5ef58 Fix compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 16:05:46 +02:00
Adam Brown
ece48baa9d
Merge pull request #5965 from vector-im/feature/adm/matrix-id-certificate
Handling SSL/TLS errors during WellKnown lookup
2022-05-10 12:17:48 +01:00
dependabot[bot]
6ed20589fb
Bump olm-sdk from 3.2.10 to 3.2.11
Bumps olm-sdk from 3.2.10 to 3.2.11.

---
updated-dependencies:
- dependency-name: org.matrix.android:olm-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 23:10:42 +00:00
Travis Ralston
c63a5c0201 Remove spec v1.3 check for threads
Citation: https://matrix.to/#/!ewdjhNcPcEmYNKzlWp:t2l.io/$CkPuvKdFZyFL547JCy5J3MfvLaWUo_a1XEdmiop1PKc?via=matrix.org&via=element.io&via=envs.net
2022-05-09 16:36:43 -06:00
Maxime NATUREL
7aa958b9ff Fix getting related eventId for location events 2022-05-09 16:11:36 +02:00
Maxime NATUREL
b577f6ab8e Fix display in Bubble mode 2022-05-09 15:15:33 +02:00
Benoit Marty
e35ee03178 Try to workaround Dependabot issue #5961 2022-05-09 11:40:53 +02:00
Marcel
3f56dad1eb
Fixed dependabot 2022-05-06 18:23:58 +02:00
Adam Brown
e97cdb03fa updating the well known lookup to take into account certificate errors when triggered via the sign in with matrix id flow 2022-05-06 16:38:40 +01:00
Eric Decanini
9f9c6fbc5b
Merge pull request #5953 from vector-im/task/eric/reformat-project
Reformats project based on editorconfig
2022-05-06 11:43:54 +02:00
ericdecanini
be0be699e4 Fixes formatting errors in ExportEncryptionTest and VectorBaseActivity 2022-05-06 10:10:25 +02:00
dependabot[bot]
6668814ab6
Bump libphonenumber from 8.12.47 to 8.12.48
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.47 to 8.12.48.
- [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.47...v8.12.48)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-05 23:09:00 +00:00
ericdecanini
4266c330de Reverts change to when arrow alignment on some classes 2022-05-05 19:33:45 +02:00
ericdecanini
3fb03e2b2c Reformats project based on editorconfig 2022-05-05 19:10:35 +02:00
Adam Brown
82edf083f0 Merge branch 'main' into develop 2022-05-05 17:16:08 +01:00
Adam Brown
0683085398 fixing crash on launch
- due to missing primary key migration in the live location
2022-05-05 17:11:48 +01:00
ganfra
83f8a8f278 Bump version to 1.4.16 2022-05-05 11:34:12 +02:00
Benoit Marty
2d98cbd915 Rename now to more explicit currentTimeMillis 2022-05-04 17:48:36 +02:00
Benoit Marty
09e628f227
Merge branch 'develop' into feature/bma/currentTimeMillis 2022-05-04 17:43:03 +02:00
Adam Brown
1d59f69a57
Merge pull request #5909 from vector-im/defect/adm/crash-when-processing-call-events
Fixes crash when accepting VOIP calls
2022-05-04 11:16:51 +01:00
Benoit Marty
dcc20bbfeb
Merge pull request #5854 from vector-im/feature/bma/small_fixies
Documentation update
2022-05-04 11:57:19 +02:00
Benoit Marty
5076b2cdbd
Merge pull request #5858 from vector-im/feature/bma/room_api
Room now exposes methods to get the various Services
2022-05-04 11:55:04 +02:00
Benoit Marty
b5a0c944d1
Merge pull request #5869 from vector-im/feature/mna/PSF-884-live-location-aggregation
[Live location sharing] Improve aggregation process of events
2022-05-04 11:11:39 +02:00
Benoit Marty
2ff6604555
Merge pull request #5890 from vector-im/feature/bma/another_cleanup
This is not necessary to map the EventId
2022-05-04 10:47:05 +02:00
Maxime NATUREL
3b022eee83 Adding return type description in doc of StateService 2022-05-03 15:20:06 +02:00
Maxime NATUREL
e5bb7ae5cd Return the created eventId in methods to send state events 2022-05-03 15:06:04 +02:00
Benoit Marty
6a61e639e0 SDK: Replace usage of System.currentTimeMillis() by a Clock interface (#4562)
Sometimes move to UUID or Random numbers instead.
2022-05-03 15:02:34 +02:00
Benoit Marty
40e26900b0 Create a Clock SDK side (#4562) 2022-05-03 15:02:34 +02:00
Adam Brown
c09a93c171 fixes crash when accepting calls
- the event insert logic is designed to be single threaded however the scope will allow coroutine continuation which leads to unintended multiple thread access for processing and post processing
- the fix is to convert the launching to a flow which will sequentially process the launch logic on the single threaded scope
2022-05-03 12:26:13 +01:00
Maxime NATUREL
a971b19f5c Removing location info from log 2022-05-02 15:06:13 +02:00
Benoit Marty
672023e94b This is not necessary to map the EventId, it does not bring any new information. 2022-05-02 15:01:02 +02:00
ericdecanini
c9b32fec44 Changes ordering of room subtitles used 2022-05-02 14:42:56 +02:00
Maxime NATUREL
1720dc1fac Removing non necessary fields when mapping from DB model 2022-05-02 14:23:24 +02:00
ericdecanini
47493fcfa1 Replaces method for getting the space parents of rooms 2022-05-02 14:11:17 +02:00
Maxime NATUREL
3201308125 Renaming other timestamps with shorter names 2022-05-02 14:05:05 +02:00
Maxime NATUREL
11ebab094b Fixing aggregation and adding debug logs 2022-05-02 12:24:30 +02:00
Maxime NATUREL
0fc2352c07 Adding docs to describe message contents 2022-05-02 11:21:41 +02:00
Maxime NATUREL
a27569770b Renaming timestamp fields 2022-05-02 11:10:36 +02:00
Maxime NATUREL
e82e79d7e2 Fixing code quality issues 2022-04-29 14:21:44 +02:00
Maxime NATUREL
e8556ec830 Renaming aggregated summary model 2022-04-29 14:17:35 +02:00
Maxime NATUREL
1db0e71796 Moving beacon info structure into message package 2022-04-29 14:01:01 +02:00
Maxime NATUREL
444d2c6491 Renaming message contents 2022-04-29 13:59:47 +02:00
Maxime NATUREL
3460df7ac8 Rename isLive field to isActive 2022-04-29 13:47:12 +02:00
Maxime NATUREL
f9220e4185 Adding helper method to avoid adding comment 2022-04-29 13:37:14 +02:00
Maxime NATUREL
61b1e84e61 Making eventId as primary key 2022-04-29 13:10:37 +02:00
Benoit Marty
cbc29d0699
Merge pull request #5872 from vector-im/feature/bca/crypto_olm_faster_decrypt
olm try to decrypt with recent session first
2022-04-29 11:49:22 +02:00
Valere
50a4d2ba0a olm try to decrypt with recent session first 2022-04-29 11:01:45 +02:00
Valere
a1e980d103 fix doing password stretching on main thread 2022-04-29 10:41:14 +02:00
Valere
de580cc997 Fix make verif scope as a child of crypto scope 2022-04-29 09:42:56 +02:00
Maxime NATUREL
a2aafb9b6b Fixing code quality issues 2022-04-28 17:16:13 +02:00
Maxime NATUREL
4f1596d105 Removing TODOs 2022-04-28 17:03:17 +02:00
Maxime NATUREL
779cbc8c08 Realm migration 2022-04-28 16:43:47 +02:00
Maxime NATUREL
6e68a5187e Fixing wrong timestamp unit for location event 2022-04-28 14:51:02 +02:00
Maxime NATUREL
65724fbdd4 Mapping between entity/model 2022-04-28 14:36:23 +02:00
Maxime NATUREL
f283a95c03 Implementing aggregation processor methods 2022-04-28 14:24:17 +02:00
Maxime NATUREL
b788a82d0d Adding live summary entity into annotation entity 2022-04-28 12:10:39 +02:00
Maxime NATUREL
25ca50c7bd Fix final members in Entity 2022-04-28 11:58:49 +02:00
ericdecanini
b280358077 Adds more named arguments to RoomSummaryUpdater 2022-04-28 11:55:44 +02:00
ericdecanini
33475602f8 Adds canonical named argument to RoomSummaryUpdater 2022-04-28 11:54:51 +02:00
Benoit Marty
3bcfd7c103 Fix tests 2022-04-28 11:03:46 +02:00
Benoit Marty
2ce92f0d41 Fix wrong copyright 2022-04-28 10:50:47 +02:00
ericdecanini
9e53e6cc8f Adds space name to rooms in filtered search 2022-04-28 10:41:40 +02:00
Benoit Marty
f4b7161db2 Room now exposes methods to get the various Services 2022-04-28 09:37:58 +02:00
Valere
0f06368027 Code review 2022-04-28 09:09:38 +02:00
Maxime NATUREL
f04b67ba29 Adding missing internal qualifier 2022-04-27 18:01:10 +02:00
Benoit Marty
a27ecac598 Update the doc 2022-04-27 17:30:34 +02:00
Maxime NATUREL
d18ea43211 Adding new field in EventAnnotationsSummary 2022-04-27 17:17:31 +02:00
Maxime NATUREL
10aa753231 Creating classes to save aggregated summary of a live location share 2022-04-27 17:16:06 +02:00
Benoit Marty
b319ef40ba Add files to document module and packages 2022-04-27 16:52:45 +02:00
Benoit Marty
250baf225c Suppress legacy Riot classes from being documented. 2022-04-27 16:31:53 +02:00
Aris Kotsomitopoulos
09e8c104bb
Merge pull request #5592 from vector-im/feature/aris/prevent_decryption_fom_suspend_functions
Avoid accessing realm instance from suspend functions
2022-04-27 17:09:39 +03:00
Benoit Marty
01be02abb5 Remove unused members 2022-04-27 14:31:02 +02:00
Valere
23f32aae84 Merge branch 'develop' into feature/bca/crypto_better_key_share 2022-04-27 12:54:41 +02:00
ariskotsomitopoulos
5cfe218634 Wrap only cryptoService.decryptEvent with runBlocking instead of the whole methods 2022-04-27 12:38:25 +03:00
ariskotsomitopoulos
51b42929bd Merge branch 'develop' into feature/aris/prevent_decryption_fom_suspend_functions
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
2022-04-27 12:26:16 +03:00
ariskotsomitopoulos
780f1ffc8c Merge branch 'develop' into feature/aris/fix_account_deactivation_issue
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
2022-04-27 12:15:36 +03:00
Valere
8920ed3de8 Code review 2022-04-27 09:45:26 +02:00
Valere
728faaee19 Fix missing mapper for incoming key forward trail 2022-04-26 17:31:01 +02:00
Valere
eaf104495d Cleaning, code review 2022-04-26 17:31:01 +02:00
Valere
058d2e6b72 Fix: ignore key request form self devices 2022-04-26 17:30:53 +02:00
Valere
885f836adb Cleaning, review 2022-04-26 17:30:53 +02:00
Valere
effbc47bd3 FIx unit test compilation 2022-04-26 17:30:53 +02:00
Valere
631ea50bde Move some crypto classes to API + cleaning 2022-04-26 17:30:42 +02:00
Valere
3f5f2dc0f1 Fix tests 2022-04-26 17:30:42 +02:00
Valere
a60171ce29 Reactivate withheld and verification tests 2022-04-26 17:30:42 +02:00
Valere
f9dd3b96d6 Stop using workers for interactive verification 2022-04-26 17:30:20 +02:00
Valere
54fb4ae8db proper initial withheld support 2022-04-26 17:30:20 +02:00
Valere
88cf1a5e67 Fix unneeded re-uploade of key got from backup
and disabled prompting for untrusted key sharing
2022-04-26 17:30:20 +02:00
Valere
cc107498eb Fix database migration 2022-04-26 17:30:20 +02:00
Valere
81b114fc82 Add change log + quick quality fix 2022-04-26 17:30:20 +02:00
Valere
1d948d6b20 Add option to disable key gossip, clear key request on trust change 2022-04-26 17:30:20 +02:00
Valere
6a509ce22d fix unused var 2022-04-26 17:30:20 +02:00
Valere
ae6df469e2 Add incoming key forward trail 2022-04-26 17:30:20 +02:00
Valere
b1db6ca180 fix db migration 2022-04-26 17:30:20 +02:00
Valere
9747eb2432 Add share test + fix
Crypto config to only request to own device. Only cancel request if ratchet index is low enough
2022-04-26 17:30:20 +02:00
Valere
9177cb11d5 Refactor key and secret request managers
use megolm backup before sending key request
2022-04-26 17:27:52 +02:00
Benoit Marty
6ee0b62272
Merge branch 'develop' into feature/bma/sdk_doc_update 2022-04-26 16:15:07 +02:00
Benoit Marty
d4c0575f28 Merge remote-tracking branch 'origin/hotfix/1.4.13' into develop 2022-04-26 11:50:23 +02:00
ariskotsomitopoulos
ba99d5c028 Merge branch 'develop' into feature/aris/fix_account_deactivation_issue
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
2022-04-26 12:49:21 +03:00
Benoit Marty
b2f9d6778a Version hotfix 1.4.13 2022-04-26 11:29:40 +02:00
Maxime NATUREL
343322ef21
Merge pull request #5814 from vector-im/fix/mna/live-location-beacon-format
[Live location sharing] - Removing BeaconInfo structure
2022-04-26 09:57:46 +02:00
Benoit Marty
cd06ba656a Ensure getRootSpaceSummaries() is not called on the main thread. 2022-04-25 16:10:17 +02:00
Benoit Marty
272bdf95cb Use the session SearchService to search in a room. 2022-04-25 09:49:51 +02:00
Benoit Marty
0092a7057e Access the various services with a getter 2022-04-25 09:49:51 +02:00
Benoit Marty
016551f79f This 2 services can also be Lazy 2022-04-25 09:49:05 +02:00
Benoit Marty
0449606f0b Dokka config: try to ignore org.matrix.android.sdk.internal.legacy.riot 2022-04-25 09:49:05 +02:00
Benoit Marty
51f7c68d3f Dokka config: emit a warning for undocumented elements 2022-04-25 09:49:05 +02:00
Benoit Marty
96b2254ac1 Small update of the Matrix documentation 2022-04-25 09:48:57 +02:00
Benoit Marty
b36955f6e2
Merge pull request #5812 from vector-im/feature/bma/dokka_3
Feature/bma/dokka 3
2022-04-25 09:43:17 +02:00
TarasSmakula
2839d1467f
Feature/5575 custom auth params for sign up (#5577)
Add a fun `RegistrationWizard.registrationCustom()` to be able to use any parameters during the registration.
Move terms converter into `api` package.
2022-04-21 20:02:27 +00:00
Benoit Marty
96350b0ed0
Merge pull request #5813 from vector-im/feature/bma/query
Improve code in file TimelineEventEntityQueries.kt
2022-04-21 21:11:30 +02:00
Maxime NATUREL
914db8c6be Removing BeaconInfo structure 2022-04-21 15:52:16 +02:00
Benoit Marty
dbc558afbc More cleanup in TimelineEventEntityQueries.kt 2022-04-21 14:37:56 +02:00
Benoit Marty
7f09a37503 Move code to TimelineEventEntityQueries.kt (#5810) 2022-04-21 14:27:17 +02:00
Eric Decanini
c21ec983e8
Merge pull request #5805 from vector-im/task/eric/format-project
Formats project with new code style
2022-04-21 12:43:28 +02:00
Benoit Marty
863ed2f15d Move GetPushRulesResponse to internal package 2022-04-21 12:30:34 +02:00
Benoit Marty
4def1e6068 Rename internal package from notification to pushrules 2022-04-21 12:30:11 +02:00
Benoit Marty
729a2e6372 Move pushrules package to the session package 2022-04-21 12:30:11 +02:00
Eric Decanini
aebdee1070
Merge pull request #5652 from vector-im/bugfix/eric/sending-images-crashes
Potentially fixes intermittent crashing from sending gallery images
2022-04-21 11:54:59 +02:00
ericdecanini
de899bbb18 Formats entire project 2022-04-21 11:50:15 +02:00
Benoit Marty
7f3e72b9cb
Merge pull request #5772 from vector-im/feature/bma/ignore_users
Delete Events from ignored users and trigger a clear cache request dialog when unignoring user(s)
2022-04-21 11:03:09 +02:00
dependabot[bot]
ed0ef4ad81
Bump libphonenumber from 8.12.46 to 8.12.47
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.46 to 8.12.47.
- [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.46...v8.12.47)

---
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-04-20 23:08:25 +00:00
ericdecanini
92d177a68e Makes MigrateAuthTo005 class internal 2022-04-20 20:05:54 +02:00
ericdecanini
9b479ca8c0 Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken 2022-04-20 18:23:27 +02:00
Adam Brown
441751a6ec updating release version in preparation for next cycle 2022-04-20 15:03:46 +01:00
ericdecanini
8eab24c53d Replaces writeAsync with awaitTransaction 2022-04-20 11:10:01 +02:00
ericdecanini
90b063f0de Replaces doWithRealm with writeAsync 2022-04-20 10:55:06 +02:00
ericdecanini
4a010a7a2a Removes runCatching from TemporaryFileCreator 2022-04-19 13:31:13 +02:00
ariskotsomitopoulos
945d0ce035 Fix import ordering 2022-04-19 11:50:50 +03:00
ariskotsomitopoulos
459ae7276d Refactor packages 2022-04-19 11:36:59 +03:00
ariskotsomitopoulos
8a2cd97df0 Resolve merge conflicts 2022-04-19 11:12:28 +03:00
ariskotsomitopoulos
b96adadf1b Merge branch 'develop' into feature/aris/fix_account_deactivation_issue
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
2022-04-19 11:06:43 +03:00
Aris Kotsomitopoulos
abe07c73a4
Merge pull request #5775 from vector-im/feature/aris/threads_after_release_experience
Enhance user experience when home servers do not support threads.
2022-04-19 10:59:41 +03:00
Olivér Falvai
a8bbf29b42 Remove unused dependencies 2022-04-15 22:50:54 +02:00
Benoit Marty
903e226e59 Restart the timeline when some Event are deleted, for instance when ignoring a user, for the change to take effect 2022-04-15 16:30:09 +02:00
ariskotsomitopoulos
1a38b8c3c9 Replace var with val 2022-04-15 16:32:48 +03:00
Benoit Marty
cc8f086cc3 copyright 2022-04-15 13:32:30 +02:00
Benoit Marty
cdcf57659f Do not update the cache manually, else the initial sync request will not be triggered. 2022-04-15 12:54:04 +02:00
Benoit Marty
6b9f2965da Request an initial sync when a user is unignored (#1899) 2022-04-15 12:07:28 +02:00
Benoit Marty
6ed1516d90 Delete messages from just ignored users from our database (#1899) 2022-04-15 11:15:08 +02:00
Benoit Marty
ff28cb4349 Add TODO 2022-04-15 10:41:09 +02:00
Benoit Marty
b6f345aec2 Format 2022-04-15 10:18:30 +02:00
Adam Brown
e58677a104
Merge pull request #5763 from vector-im/feature/adm/server-selection-errors
FTUE - Server selection errors
2022-04-14 17:22:58 +01:00
Benoit Marty
6a6f59a3be
Merge pull request #5757 from ofalvai/bugfix/uploads-order-e2e
Fix sorting of uploads in encrypted rooms
2022-04-14 18:11:49 +02:00
Benoit Marty
97f2206f2a
Merge pull request #5767 from vector-im/feature/bma/unignore_user
Unignore user must perform an initial sync
2022-04-14 17:31:32 +02:00
Benoit Marty
a171a29bf1
Merge pull request #5762 from vector-im/feature/bma/dokka_2
Make some data class immutable
2022-04-14 17:17:55 +02:00
Adam Brown
eda1d9142c using expression bodies for boolean checks
- moves first expression line  onto the declaration line
2022-04-14 16:10:22 +01:00
Onuray Sahin
aa55b1f6b3
Merge pull request #5758 from vector-im/feature/ons/live_location_stop_sharing
Live Location Sharing - Update beacon info state event when sharing is ended
2022-04-14 17:12:50 +03:00
Onuray Sahin
f49e7d9619 Code review fixes. 2022-04-14 16:23:43 +03:00
Benoit Marty
fe0332957b Add API documentation 2022-04-14 14:53:25 +02:00
Adam Brown
1b33c03d91 lifting unavailable homeserver condition to the other error types 2022-04-14 12:01:23 +01:00
Benoit Marty
13cc0a2e8d Immutable data class. var -> val. The code should be equivalent. 2022-04-14 12:14:09 +02:00
Benoit Marty
015438289e Immutable data class. var -> val 2022-04-13 19:29:53 +02:00
Benoit Marty
7773b75834 Immutable data class. var -> val 2022-04-13 19:08:31 +02:00
Benoit Marty
3435357b1c Immutable data class. var -> val 2022-04-13 18:55:56 +02:00
Benoit Marty
10b47c33d1 Small formatting issue 2022-04-13 18:53:59 +02:00
Benoit Marty
13cf510e8a Better contract. Explicit parameter usage 2022-04-13 18:53:27 +02:00
Benoit Marty
2858401a12 Immutable data class. var -> val, MutableList -> List 2022-04-13 18:52:20 +02:00
Eric Decanini
9b7e94ebab
Fixes myroomnick changing Display Name (#5618) 2022-04-13 18:35:33 +02:00
Benoit Marty
91c896f566 Add missing internal keyword 2022-04-13 18:08:43 +02:00
Olivér Falvai
daaca4e46a Fix sorting of uploads in encrypted rooms 2022-04-13 17:24:26 +02:00
Onuray Sahin
4ee7332973 Update beacon info state event by setting live as false. 2022-04-13 16:59:42 +03:00
Benoit Marty
5075775c56
Merge pull request #5744 from vector-im/feature/bma/dokka
Set up dokka to generate SDK documentation and cleanup the API
2022-04-13 14:49:10 +02:00
Benoit Marty
e30c68fb82 Remove dokka dependencies classpath for this specific module, it's already declared in the main build.gradle file. 2022-04-13 13:45:06 +02:00
ericdecanini
eb3f704745 Adds mkdirs to TemporaryFileCreator 2022-04-13 12:42:21 +02:00
Adam Brown
0bf84341af
Merge pull request #5747 from vector-im/feature/adm/concurrent-new-session-crash
Fixing crash when navigating the app whilst room keys are being processed
2022-04-13 10:43:10 +01:00
Maxime NATUREL
071340c868 Remove non necessary comment + adding a TODO for missing aggregation check 2022-04-13 10:39:13 +02:00
SpiritCroc
7c0cd1dc52 Fix ktLint / op-spacing 2022-04-12 19:17:07 +02:00
Adam Brown
594b442a21 copying the list of new session listeners to avoid concurrent modification
- copying the list avoids the need to synchronise the add/removing/iterations
2022-04-12 17:36:05 +01:00
Benoit Marty
38bbbd62a4 Restore the correct copyright 2022-04-12 16:35:32 +02:00
Benoit Marty
bfbcef60e9 Run ktlintFormat 2022-04-12 16:09:56 +02:00
Benoit Marty
23d2a290ab Global import optimization 2022-04-12 16:06:27 +02:00
Maxime NATUREL
e50192910d Keep track of time out using last location event 2022-04-12 15:51:02 +02:00
Maxime NATUREL
d78ed3215b Adding support for notifications and message preview 2022-04-12 15:51:02 +02:00
Maxime NATUREL
6e61085b1f Removing TODO 2022-04-12 15:51:02 +02:00
Maxime NATUREL
aabfc81816 Show start event of live without conditions 2022-04-12 15:51:02 +02:00
Benoit Marty
4e48c076e8 Make RuntimeJsonAdapterFactory internal and cleanup 2022-04-12 15:47:09 +02:00
Benoit Marty
7514edb399 Convert RuntimeJsonAdapterFactory to Kotlin 2022-04-12 15:41:37 +02:00
Benoit Marty
73270476d2 Rename .java to .kt 2022-04-12 15:41:37 +02:00
Benoit Marty
150c64350e Move UnsignedDeviceInfo to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
b6eafbe344 Move SendToDeviceObject to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
89f20e1cfb Move RoomKeyRequestBody to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
ed94d3ff1f Move EncryptedFileInfo and EncryptedFileKey to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
7eaef934db DeviceKeys is now internal, removing unused code. 2022-04-12 15:41:37 +02:00
Benoit Marty
d07f26904a Move MXEncryptEventContentResult to api package
Note that this is not correct, but I do not want to refactor more on this PR. I added a TODO
2022-04-12 15:41:37 +02:00
Benoit Marty
6682170f6e Move MXDeviceInfo to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
cc1fc29e7c Move MegolmBackupAuthData to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
851708c1b4 Add some todos 2022-04-12 15:41:37 +02:00
Benoit Marty
f56ea8be37 Move KeysBackupVersionTrustSignature to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
a479e180ac internal 2022-04-12 15:41:37 +02:00
Benoit Marty
11236501c4 Move MXEventDecryptionResult to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
2b7144cad9 Make it clear in the generated doc that some class must not be used. 2022-04-12 15:41:37 +02:00
Benoit Marty
c11194dcc5 Move GossipingRequestState and OutgoingGossipingRequestState to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
90e6c07202 Split into several files 2022-04-12 15:41:37 +02:00
Benoit Marty
d0a4075238 Move TaggedEventsContent to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
d4d74d3e11 Move ThreePidCredentials to its own file and make it internal 2022-04-12 15:41:37 +02:00
Benoit Marty
b5654d54b9 Move InteractiveAuthenticationFlow to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
5c6b370c63 Add explicit-api compiler option for hte SDK module. Disabled for now. 2022-04-12 15:41:37 +02:00
Benoit Marty
4e88b7fd11 Move CryptoCrossSigningKey to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
c0aafab857 Move to the other package about crypto 2022-04-12 15:41:37 +02:00
Benoit Marty
e91541333c Move SecretShareRequest to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
e8bfbdd71a Move GossipingToDeviceObject to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
0107836e1b Extract GossipingDefaultContent to its own file 2022-04-12 15:41:37 +02:00
Benoit Marty
814ba43867 Move andThen extension to app module 2022-04-12 15:41:37 +02:00
Benoit Marty
1403557213 Move LocalizedFlowDataLoginTerms to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
74e475d92c Move CryptoConstants to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
0f6b47e511 Move NewSessionListener to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
02cc9d6d4e Move InitialSyncStrategy to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
16c8296735 toQrCodeData() is now internal 2022-04-12 15:41:37 +02:00
Benoit Marty
3735ac307f Add entry to keyBackupService to expose deriveKey, which becomes internal
And format code
2022-04-12 15:41:37 +02:00
Benoit Marty
1402416338 Move MXUsersDevicesMap to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
f8d0a22edf Remove combineLatest from SDK, and cleanup 2022-04-12 15:41:37 +02:00
Benoit Marty
363524b556 Move ForwardedRoomKeyContent to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
47dad42f08 Move RoomKeyShareRequest to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
9190b8b67f Move DefaultBaseAuth to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
c51967453f Move DevicesListResponse to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
ed8097ed92 Create Settings module to add interface for LightweightSettingsStorage 2022-04-12 15:41:37 +02:00
Benoit Marty
a054080cee Move OlmDecryptionResult to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
897c711afb Move OutgoingRoomKeyRequest to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
4799326058 Move IncomingRoomKeyRequest to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
e6bc6305aa Move MegolmBackupCreationInfo to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
af2825eb39 Move DeviceInfo to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
e9161dd4af Move IncomingSecretShareRequest to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
7644bd46ad Move IncomingRequestCancellation to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
e6fc723bee Move KeysVersion to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
97c1929e12 Move KeysBackupLastVersionResult to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
36fd5706c2 Move KeysBackupVersionTrust to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
229547fa49 Move KeysVersionResult to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
4b7401062a Move ImportRoomKeysResult to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
1bc6bec973 Move Base64 facility to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
d8eac14294 MoshiProvider is now internal. Create MatrixJsonParser to expose it to the app. 2022-04-12 15:38:20 +02:00
Benoit Marty
b1f4aa91e2 Move Fingerprint to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
0720196ee6 Move CryptoDeviceInfo to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
c9bbf6c53a Move RecoveryKey functions to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
d4ff273bc4 Move TermsResponse to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
627a1291b0 Move awaitCallback() extension to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
ccce552097 Move md5() extension to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
0cb770334c Move content data class to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
03dba3bbba Move SavedKeyBackupKeyInfo to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
a3575fbc6b Move PrivateKeysInfo to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
3895ac85d8 Move SyncService to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
1684ba1d14 Move ElementToDecrypt to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
24d044b147 Move DeviceTrustLevel, DeviceTrustResult and UserTrustResult to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
567f298bd0 Remove unused code. 2022-04-12 15:38:20 +02:00
Benoit Marty
7711eb584c Move SignInvitationResult and RoomAliasDescription to api package 2022-04-12 15:38:20 +02:00
Benoit Marty
73d22d0622 Move SpacePeekResult to api package, and cleanup 2022-04-12 15:38:20 +02:00
Benoit Marty
b4dbb389b1 Internal + add some doc 2022-04-12 15:38:20 +02:00
Benoit Marty
83570dc24b Move TextContent class to api package
It is used by the app. Make the extensions internal
2022-04-12 15:38:20 +02:00
Benoit Marty
dc092f889b Add missing internal keyword.
Classes marked with `internal` will be excluded from Kdoc.
2022-04-12 15:38:20 +02:00
Benoit Marty
4d49ccaf8c Configure Dokka plugin to generate Kdoc
Run `./gradlew matrix-sdk-android:dokkaHtml` to generate the Html documentation of the Matrix Android SDK
2022-04-12 15:38:20 +02:00
aringenbach
047a45d77f
Add a setting to be able to always appear offline (#5583)
Add a setting to be able to always appear offline
Move presence enabling to a app-only preference
2022-04-12 12:08:56 +02:00
David Langley
454a65602b
Merge pull request #5639 from vector-im/feature/dla/uisi_match_web_implementation
Align Autorageshake with web implementation
2022-04-12 10:36:43 +01:00
David Langley
363afd0089 Update naming to InitialSyncProgressing for clarity. 2022-04-12 09:35:35 +01:00
Benoit Marty
836a12d047
Merge pull request #5719 from vector-im/feature/bma/improved_logs
Do not cancel the current sync request when the app goes to background
2022-04-12 09:23:24 +02:00
ganfra
f7e8c01121
Merge pull request #5554 from SpiritCroc/endless-loading
Fix endless loading timeline due to conflicting chunks
2022-04-11 18:52:24 +02:00
ariskotsomitopoulos
3eb97923cc Update Copyright 2022-04-11 15:43:32 +03:00
ariskotsomitopoulos
9414a29b80 Add Cancelled state to UIA 2022-04-11 15:38:18 +03:00
Onuray Sahin
5f635de0ac
Merge pull request #5711 from vector-im/feature/ons/live_location_aggregation
Live Location Sharing - Attach location data to beacon info state event
2022-04-11 15:01:59 +03:00
Onuray Sahin
1c5cf6b29e Code review fixes. 2022-04-11 13:14:42 +03:00
SpiritCroc
902d2f7338 TokenChunkEventPersistor: move link fixing to its own method 2022-04-11 12:09:07 +02:00
Benoit Marty
03d6aa8cd3 Do not cancel current sync request when going to background #5621
Incremental sync can be long and it requires the user to wait for the treatment to end, else all is restarted from the beginning each time the user moves the app to foreground.
2022-04-08 16:01:04 +02:00
Onuray Sahin
28f483870f Code review fixes. 2022-04-08 13:26:36 +03:00
Onuray Sahin
15e1c7bc37 Code review fixes. 2022-04-08 13:18:17 +03:00
ganfra
72bd398ae0
Merge pull request #5481 from SpiritCroc/readmarkerupdate
Fix updating unread marker if not to latest chunk
2022-04-07 10:23:58 +02:00
Benoit Marty
dbf10a222f Privacy: does not log reaction (it is a vlog, so not critical) 2022-04-07 10:15:21 +02:00
Benoit Marty
d4add052d9 This log was quite useless 2022-04-07 09:30:42 +02:00
Onuray Sahin
6708ed8b34 Lint fixes. 2022-04-06 19:02:50 +03:00
Onuray Sahin
faa07513ec Update last location content of beacon info state event. 2022-04-06 19:01:25 +03:00
ganfra
94099f4908
Merge pull request #5659 from SpiritCroc/permalink-failure
Fix endless loading timeline if opened at non-existing event
2022-04-06 17:57:48 +02:00
Onuray Sahin
197b542030 Check if live location data is valid. 2022-04-06 17:31:56 +03:00
Benoit Marty
c276d6ae74
Merge pull request #5707 from vector-im/feature/aris/threads_prune_deleted_events
Prune the content of deleted events completely
2022-04-06 15:53:21 +02:00
Onuray Sahin
aae281a7ea Support aggregation of live location beacon events. 2022-04-06 16:34:30 +03:00
Benoit Marty
9c1cdf6488
Merge pull request #5703 from vector-im/feature/bma/avoid_error_log
Feature/bma/avoid error log
2022-04-06 15:08:20 +02:00
ariskotsomitopoulos
9d41508530 Prune the content of deleted events completely 2022-04-06 15:48:54 +03:00
Onuray Sahin
2a42eb8c87
Merge pull request #5697 from vector-im/feature/ons/live_location_pulse
Live Location Sharing - Send location data
2022-04-06 15:35:02 +03:00
Benoit Marty
7e8c7f32fb Fix long line. It's OK to log the whole data class (same log than previous) 2022-04-06 14:33:06 +02:00
Benoit Marty
26e80ba70b KeysBackup: Better handling of 404 to avoid error log 2022-04-06 12:38:52 +02:00
Benoit Marty
785ccc8bc4 Format file 2022-04-06 11:18:45 +02:00
Benoit Marty
e8f421fe34 Create Event.isLocationMessage() 2022-04-06 11:17:55 +02:00
Benoit Marty
e27dcbc9b9 Create Event.getMsgType() extension 2022-04-06 11:15:01 +02:00
Benoit Marty
02401f7f3d Version++ 2022-04-05 22:37:16 +02:00
Benoit Marty
0f14652932
Merge pull request #5692 from vector-im/feature/aris/threads_beta_infrom_users_on_reply
Threads Beta opt-in mechanism
2022-04-05 20:40:16 +02:00
ariskotsomitopoulos
37dc77cc3e Add isValid check to RealmChangeListener to prevent crashes on deleted objects 2022-04-05 20:36:33 +03:00
Onuray Sahin
c26c9ff1cc Send live location data. 2022-04-05 12:49:12 +03:00
Onuray Sahin
48d40d8ba2
Merge pull request #5651 from vector-im/feature/ons/live_location_beacon_info
Live Location Sharing - Beacon Info
2022-04-04 12:55:22 +03:00
Onuray Sahin
273b4816db Fix lint error. 2022-04-04 12:03:43 +03:00
Adam Brown
3aac59a5ae
Merge pull request #5080 from vector-im/feature/adm/encrypted-last-message
Updating encrypted room list message previews on key updates
2022-04-01 17:48:05 +01:00
Adam Brown
57bf044df0 adding documentation to the new session listener 2022-04-01 16:57:23 +01:00
Onuray Sahin
97de6de8f2 Code review fixes. 2022-04-01 17:04:52 +03:00
Onuray Sahin
922d68cfda Code review fixes, use unstable prefixes as MSCs suggest. 2022-04-01 15:01:25 +03:00
dependabot[bot]
224eb7a968
Bump libphonenumber from 8.12.45 to 8.12.46
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.45 to 8.12.46.
- [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.45...v8.12.46)

---
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-03-31 23:08:28 +00:00
Adam Brown
eb72587238 removing unused import 2022-03-31 17:23:05 +01:00
Adam Brown
ced621d469 refreshing the room summaries when new crypto sessions are recieved
- matches the same flow as the timeline by starting observing in the ViewModel init
2022-03-31 17:23:05 +01:00
Adam Brown
4629353314 removing noop newSession from base decryption interface, it's only relevant for Megolm sessions 2022-03-31 17:13:31 +01:00
Aris Kotsomitopoulos
3c06d56b87
Merge pull request #5627 from vector-im/feature/aris/threads_summary_event_redaction
Thread redaction will now update the thread summary counter
2022-03-31 16:21:35 +03:00
Benoit Marty
9a2cc1a4c5
Merge pull request #5664 from vector-im/feature/bma/dep_upgrade
Upgrade Jitsi and ktlint
2022-03-31 11:32:14 +02:00
SpiritCroc
c44c637fba Also give up loading event for M_FORBIDDEN 2022-03-30 17:35:51 +02:00
ariskotsomitopoulos
f58f3ad6d9 Refactoring 2022-03-29 14:28:57 +03:00
SpiritCroc
365c03e763 Load timeline without initial eventId if not found 2022-03-29 12:56:54 +02:00
Adam Brown
1b2e3502cb
Merge pull request #5628 from vector-im/feature/adm/direct-login-tests
Direct login tests
2022-03-29 11:44:11 +01:00
ariskotsomitopoulos
2938fa92c0 Rename countThreads method 2022-03-29 11:58:11 +03:00
Onuray Sahin
2a4182ea84 Code review fixes. 2022-03-29 11:53:44 +03:00
David Langley
b4885629af Keep live event/pagination listeners. 2022-03-28 17:23:05 +01:00
Benoit Marty
ff1fb63bf6 Fix some ktlint issues, ignore some others 2022-03-28 18:22:04 +02:00
ganfra
ebee66cfaf Update versions to 1.4.10 2022-03-28 16:37:24 +02:00
ericdecanini
ce579c1dd3 Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken
# Conflicts:
#	vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
#	vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
2022-03-28 15:59:50 +02:00
Onuray Sahin
152c921017 Send beacon info. 2022-03-28 16:23:51 +03:00
Onuray Sahin
32cf3feab8 Create beacon content class. 2022-03-28 14:45:40 +03:00
ClaireG
a9b87de7a3
[Subscribing] Blank display name 2022-03-28 10:34:22 +02:00
David Langley
f38bf2548f lint 2022-03-25 23:18:45 +00:00
David Langley
7e930472e8 Align with web implementation 2022-03-25 22:51:34 +00:00
Adam Brown
230c37597c adding happy path tests for the direct login use case 2022-03-25 11:15:05 +00:00
Eric Decanini
10974366fb
Merge pull request #5473 from vector-im/bugfix/eric/voting-ended-poll
Fixes ended poll voting
2022-03-24 20:23:38 +01:00
ganfra
3410e75790 Merge tag '1.4.7' into develop 2022-03-24 19:34:14 +01:00
ganfra
04b136e3e4 RoomList: more fixes on count 2022-03-24 18:50:33 +01:00
ganfra
745382cdfa RoomList : avoid using flow extension on realm results (leads to frozen object and leaks). 2022-03-24 15:41:42 +01:00
ganfra
70e5698082 Update versions to 1.4.7 2022-03-24 15:41:35 +01:00
ariskotsomitopoulos
3c7495bd60 Thread redaction will now update the thread summary counter
Root threads with 0 threads replies will become normal messages and removed from thread summaries
2022-03-24 16:28:49 +02:00
ericdecanini
edfe81cc2b Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
2022-03-24 14:40:28 +01:00
Adam Brown
e7a1c20132 handling the username in use as a username field error 2022-03-23 17:29:06 +00:00
Adam Brown
5aa35899bc extracting error cases to extensions and handles invalid username as a specific case 2022-03-23 17:29:06 +00:00
Adam Brown
373385b29f moving the not accepting registration error handling to the login fragment 2022-03-23 17:29:06 +00:00
ganfra
adf2c642da Update versions to 1.4.8 2022-03-23 16:27:36 +01:00
Benoit Marty
012cdf4b4d runBlocking -> runTest
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
2022-03-22 16:52:18 +01:00
Benoit Marty
86829008c3 runBlockingTest -> runTest
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
2022-03-22 16:39:39 +01:00
Benoit Marty
03fee2a131 The .exhaustive trick is not needed anymore in Kotlin 1.6.0
https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
2022-03-22 16:14:15 +01:00
Benoit Marty
7502158ba9 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
ganfra
073475854e
Merge pull request #5564 from SpiritCroc/timeline-chunk-double-linking
Fix another case of read markers not updating: Ensure proper double linking of TimelineChunks
2022-03-22 15:46:48 +01:00
ganfra
a2f64e7f3c
Merge pull request #5576 from vector-im/feature/aris/thread_labs_notice_users
Threads Migration
2022-03-22 14:57:07 +01:00
ericdecanini
7449d15d2f Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
2022-03-22 14:15:29 +01:00
ariskotsomitopoulos
c6593f0cee PR remarks 2022-03-22 13:57:20 +02:00
ariskotsomitopoulos
a431d885f0 Increase the thread summaries limit 2022-03-22 11:20:47 +02:00
ganfra
794131d274
Merge pull request #5551 from SpiritCroc/local-echo
Fix local echos not being shown when re-opening rooms
2022-03-21 19:24:07 +01:00
ariskotsomitopoulos
277619d833 Format code & add comments 2022-03-21 13:39:15 +02:00
ariskotsomitopoulos
f6b38d2b49 Add runBlocking when decrypt events to avoid thread switching when accessing the realm instance (thread local) 2022-03-21 13:13:09 +02:00
SpiritCroc
6a8230239b Avoid inconsistent timelines by db insertions before fully loaded chunk 2022-03-21 10:50:55 +01:00
SpiritCroc
626395304d Fix crash on Android 6 2022-03-19 12:01:01 +01:00
ariskotsomitopoulos
e574fda099 Remove unused import 2022-03-18 14:55:14 +01:00
ariskotsomitopoulos
06db7e2374 Enhance migration logic & PR remarks 2022-03-18 14:51:06 +01:00
ariskotsomitopoulos
fd4d99d6fc Possible NullPointerException crash fix 2022-03-18 14:50:34 +01:00
Valere
189683a8a1
Merge pull request #5552 from SpiritCroc/timeline-decryptor-crash
Fix crash when closing room during timeline decryption
2022-03-18 11:34:27 +01:00
ariskotsomitopoulos
a0e6dd5f6c Merge branch 'develop' into feature/aris/thread_labs_notice_users
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
#	vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
2022-03-18 11:28:21 +01:00
SpiritCroc
6878a973ed TokenChunkEventPersistor: always link all matching chunks
The previous fix only works around the issue when it is detected. This
may require re-entering the room once when it gets stuck. If we ensure
proper linking from the beginning, hopefully we don't run into any
issues at all.
2022-03-18 08:07:56 +01:00
ariskotsomitopoulos
2ca3387ab3 Migrate Threads and notify user 2022-03-17 18:51:54 +01:00
Arnaud Ringenbach
7593f7a2c6 Fix lint issues 2022-03-17 17:15:16 +01:00
Arnaud Ringenbach
d3459d1d3d Use MatrixConfiguration & move presence sync enabled checks out of view 2022-03-17 14:50:15 +01:00
ericdecanini
fbb6f117d0 Fixes remote echo of end poll not processing correctly 2022-03-17 13:47:57 +01:00
Eric Decanini
9c8f29e853 Merge branch 'develop' into bugfix/eric/voting-ended-poll 2022-03-17 12:07:45 +01:00
Arnaud Ringenbach
4bcf31e0c2 Add a presence sync enabling build config 2022-03-17 11:43:07 +01:00
SpiritCroc
91259bef40 Ensure proper double linking of TimelineChunks
We need both directions so getOffsetIndex() produces correct results in
all cases.
2022-03-17 11:34:20 +01:00
SpiritCroc
682f4c35d2 Fix endless loading timeline due to conflicting chunks 2022-03-16 14:24:31 +01:00
ariskotsomitopoulos
eee1ec1423 Merge branch 'develop' into feature/aris/threads_analytics 2022-03-16 13:19:08 +01:00
ariskotsomitopoulos
60db2e424e Merge branch 'develop' into feature/aris/threads_analytics 2022-03-16 13:01:09 +01:00
SpiritCroc
a994f859e1 Fix crash when closing room during timeline decryption 2022-03-16 10:19:01 +01:00
SpiritCroc
856f25f684 Fix local echos not being shown when re-opening rooms 2022-03-15 19:34:04 +01:00
Maxime NATUREL
9ef235f3d7
Merge pull request #5479 from vector-im/feature/mna/PSF-735-pinned-location
#5417: Pinned location sharing
2022-03-15 17:40:21 +01:00
aringenbach
a7639f4424
Merge pull request #5544 from vector-im/aringenbach/5521_permalink_base_url_mention
Fix mentions using matrix.to rather than client defined permalink base url
2022-03-15 17:28:16 +01:00
Maxime Naturel
f495150b4e Fixing asset type representation 2022-03-15 17:09:31 +01:00
Maxime Naturel
04405c7970 Distinguish user location and pinned location sharing 2022-03-15 17:09:30 +01:00
Arnaud Ringenbach
15e3f258f3 Fix wildcard imports 2022-03-15 16:55:24 +01:00
Onuray Sahin
db0cfd4704
Merge pull request #5455 from vector-im/feature/ons/fix_poll_start_notifications
Show notification for poll start events but not for responses
2022-03-15 18:34:03 +03:00
Arnaud Ringenbach
56760ecddc Create SpanTemplateType and factorize template creation 2022-03-15 16:33:59 +01:00
Onuray Sahin
a47b589e72 Code review fixes. 2022-03-15 17:51:02 +03:00
Onuray Sahin
7fa43f0d1b Merge branch 'develop' into feature/ons/fix_poll_start_notifications
* develop: (163 commits)
  Fix lint error.
  Removes changelog file
  Fix PR comment
  Adds changelog file
  Refactors MessageBubbleView
  Updating changelog copy
  making use of the fake overrides for testing
  extracting the personalization complete emitting to a dedicated function
  making use of binding api instead of manual findviewbyid
  using consistent method naming for setting the capabilities override
  taking the personalization feature flag into account when calculating if personalization is supported - also removes a legacy loading workaround for the account creation step, we're navigating to a new screen AccountCreated so we have to stop the loading
  adding changelog entry
  using correct label for the avatar capability debug override
  forwarding to the profile picture flow when display name changing isn't supported but pictures are when personalising the profile
  formatting
  dynamically switching the onboarding flow based on the capabilities of the homeserver - when avatars can't be changed we complete the personlisation flow
  hiding the toolbar back button and handling system back as take the user home if the display name personalisation is not supported
  adding test around account creation via dummy
  dynamically changing the account created layout based on if the homeserver supports personalisation
  adding entry points for injecting and overriding the homeserver capabilities
  ...
2022-03-15 17:49:53 +03:00
ericdecanini
9806f1bf8f Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt
2022-03-15 15:48:17 +01:00
ericdecanini
21459db634 Replaces login type unknown value with name in migration 2022-03-15 15:23:03 +01:00
Aris Kotsomitopoulos
e0b93c2d2c
Merge pull request #5298 from vector-im/feature/aris/thread_live_thread_list
Live Threads
2022-03-15 15:14:26 +01:00
ericdecanini
ef59faf160 Adds error throw for LoginActivity LoginMode Unknown 2022-03-15 15:05:33 +01:00
ericdecanini
a173accfa5 Replaces use of LoginType.value with name 2022-03-15 14:59:09 +01:00
Arnaud Ringenbach
094ebe6764 Fix ktlint on TestPermalinkService 2022-03-15 14:57:59 +01:00
Arnaud Ringenbach
a68471afe3 Fix documentation on PermalinkService 2022-03-15 14:54:24 +01:00
ericdecanini
ae540297b1 Adds custom and direct login types 2022-03-15 14:53:59 +01:00
Arnaud Ringenbach
c7aab7a3f6 Remove useless imports on TextPillsUtils 2022-03-15 14:52:13 +01:00
Arnaud Ringenbach
55fbed1a81 Remove useless PermalinkFactory import 2022-03-15 14:49:55 +01:00
Arnaud Ringenbach
ea4addf446 Fix TestPermalinkService header 2022-03-15 14:45:04 +01:00
Arnaud Ringenbach
5b04686827 Fix MarkdownParser unit tests 2022-03-15 14:27:17 +01:00
ariskotsomitopoulos
07eabf110d Merge branch 'feature/aris/thread_live_thread_list' into feature/aris/threads_analytics
# Conflicts:
#	vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
2022-03-15 14:23:48 +01:00
ariskotsomitopoulos
8a862d006e Merge branch 'develop' into feature/aris/thread_live_thread_list
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
2022-03-15 14:21:04 +01:00
Onuray Sahin
b4df6e1ae8 Merge branch 'develop' into feature/ons/poll_tests
* develop:
  Fix lint error.
  Fix lint error.
  Avoid stable prefix
  Support both unstable and stable prefixes.
2022-03-15 16:16:17 +03:00
Onuray Sahin
1a76914828
Merge pull request #5345 from vector-im/feature/ons/fix_unstable_prefixes
Support both unstable and stable prefixes
2022-03-15 15:16:16 +03:00
Onuray Sahin
f4bdaf6151 Fix lint error. 2022-03-15 14:47:19 +03:00
Onuray Sahin
dd3178c36e Merge branch 'develop' into feature/ons/poll_tests
* develop: (150 commits)
  Removes changelog file
  Fix PR comment
  Adds changelog file
  Refactors MessageBubbleView
  Updating changelog copy
  making use of the fake overrides for testing
  extracting the personalization complete emitting to a dedicated function
  making use of binding api instead of manual findviewbyid
  using consistent method naming for setting the capabilities override
  taking the personalization feature flag into account when calculating if personalization is supported - also removes a legacy loading workaround for the account creation step, we're navigating to a new screen AccountCreated so we have to stop the loading
  adding changelog entry
  using correct label for the avatar capability debug override
  forwarding to the profile picture flow when display name changing isn't supported but pictures are when personalising the profile
  formatting
  dynamically switching the onboarding flow based on the capabilities of the homeserver - when avatars can't be changed we complete the personlisation flow
  hiding the toolbar back button and handling system back as take the user home if the display name personalisation is not supported
  adding test around account creation via dummy
  dynamically changing the account created layout based on if the homeserver supports personalisation
  adding entry points for injecting and overriding the homeserver capabilities
  extracting method for the handling of the profile picture selection
  ...
2022-03-15 14:39:51 +03:00
Arnaud Ringenbach
df794ee41f Move template creation to PermalinkService 2022-03-15 11:26:47 +01:00
Arnaud Ringenbach
4cf820cb12 Use client permalink base url on mentions if available 2022-03-15 10:34:04 +01:00
ariskotsomitopoulos
d7c486c55e Add fallback support rendering proposed in MSC3676 2022-03-14 16:04:08 +01:00
ariskotsomitopoulos
d894d8598c Format text 2022-03-14 12:44:25 +01:00
ariskotsomitopoulos
d215f03798 Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-14 12:02:04 +01:00
ariskotsomitopoulos
c2ec7cfa0f Add more clear documentation 2022-03-14 11:54:29 +01:00
Maxime Naturel
291d7d7627 Fix some doc comment 2022-03-14 11:15:19 +01:00
Maxime Naturel
3d27d9d2d2 Fix filtering use case 2022-03-14 11:15:18 +01:00
Maxime Naturel
b72c357dd1 Removing unused imports 2022-03-14 11:15:18 +01:00
Maxime Naturel
0aaa650ac3 Using flow to show items counter 2022-03-14 11:15:17 +01:00
Maxime Naturel
c7dae341c0 (DRAFT) Room counter flow 2022-03-14 11:15:17 +01:00
ericdecanini
f24d8c2ada Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
2022-03-13 20:13:03 +01:00
SpiritCroc
cd45248f40 Fix modifying the wrong events in TimelineChunk
I was observing cases where builtEvents[modificationIndex] was not
having the same eventId as the udpatedEntity in handleDatabaseChangeSet.

In particular, I observed both cases that
- there was no item in the list yet with the same eventId as the updated
  one
- there was an item with the same eventId already in the list, but at a
  different position.

Whenever this happened, the timeline would render missing, duplicated,
or swapped messages in the timeline.

Instead of relying on the modificationIndex to be the same for both the
change set and builtEvents, look up the proper index by eventId.
2022-03-13 08:19:47 +01:00
Onuray Sahin
a12f918dd5 Add poll test for users try to change their votes after poll is ended. 2022-03-11 19:19:20 +03:00
Benoit Marty
c89554c3f6
Merge pull request #5443 from vector-im/task/eric/stable-hierarchy-endpoint
Changes room hierarchy endpoint to stable
2022-03-11 17:05:13 +01:00
Onuray Sahin
7c6167ace9 Add poll test for ended polls. 2022-03-11 18:59:27 +03:00
Benoit Marty
fa104adefc Fix all warnings in file E2eeSanityTests.kt 2022-03-11 15:35:21 +01:00
SpiritCroc
6ba02629ec Fix ChunkEntity.isMoreRecentThan() if both chunks linked to last forward
Imagine scenario:

[this] -> [chunkToCheck] -> [lastForwardChunk]

Then, both `isLastForward` checks will not return, and also the `chunkToCheck.doesNextChunksVerifyCondition { it == this }` will return false.
Since both chunks are connected to the last forward chunk, `isMoreRecent()` will still return `true`, which is wrong in this case.
So do not only check if chunkToCheck has this as any of the next chunks, but also the other way round.
2022-03-11 11:27:05 +01:00
SpiritCroc
0564942b0c isReadMarkerMoreRecent(): use helper to properly compare chunks 2022-03-11 11:21:59 +01:00
Onuray Sahin
8b08d3db25 Fix poll test for users vote different options. 2022-03-11 11:36:06 +03:00
dependabot[bot]
2d5638baaf
Bump libphonenumber from 8.12.44 to 8.12.45
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.44 to 8.12.45.
- [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.44...v8.12.45)

---
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-03-10 23:09:19 +00:00
ericdecanini
7226864cc9 Improves code formatting in ResolveSpaceInfoTask 2022-03-10 21:41:17 +01:00
ericdecanini
fe3c9cc09f Reverts to fix by removing event timestamp condition 2022-03-10 19:15:12 +01:00
ariskotsomitopoulos
f31b130b49 Fix unit tests 2022-03-10 19:11:14 +02:00
ariskotsomitopoulos
34cfdfb6fe Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-10 18:48:41 +02:00
Benoit Marty
becdd1ce29 Fix test compilation after method renaming
Also rename in the comment
2022-03-10 17:01:45 +01:00
ariskotsomitopoulos
a758ad71e6 Add is_falling_back support for rich thread replies
Enhance thread awareness handler so normal replies with thread disabled will be visible in te appropriate thread
Fix conflicts
2022-03-10 17:51:02 +02:00
ericdecanini
628a160c3a Reverts timestamp condition but changes timing of setting closedTime 2022-03-10 16:32:42 +01:00
ericdecanini
080844dc9d Removes event timestamp condition for sdk poll voting 2022-03-10 16:28:22 +01:00
Onuray Sahin
cd29b1aa4b Add poll test for users vote different options. 2022-03-10 17:40:16 +03:00
Benoit Marty
66f76fbea3
Merge pull request #5450 from SpiritCroc/fix-5448
Fix missing messages when forward paging with chunks > 50 messages
2022-03-10 15:08:58 +01:00
Onuray Sahin
a5441fdf22 Add poll test for someone else chose the same option. 2022-03-10 16:51:23 +03:00
ericdecanini
a5af4783cc Renames mapToSpaceChildInfoList to mapSpaceChildren in DefaultSpaceService 2022-03-10 14:41:44 +01:00
Onuray Sahin
f029759f9a Add poll test for changing previous answer. 2022-03-10 15:47:40 +03:00
Onuray Sahin
1b348401bd Add poll test for a single vote. 2022-03-10 15:31:32 +03:00
Benoit Marty
d83d5f9828
Merge pull request #5467 from vector-im/feature/bma/unused_resources_all
Remove unused resources
2022-03-10 13:03:27 +01:00
Onuray Sahin
fd3e5128c7 Test initial poll event. 2022-03-10 14:30:03 +03:00
ericdecanini
a891f59397 Replaces lateinit var with passing params 2022-03-10 12:02:25 +01:00
ariskotsomitopoulos
21111922e6 Merge branch 'develop' into feature/aris/thread_live_thread_list
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
2022-03-10 12:55:13 +02:00
ariskotsomitopoulos
fd30d38603 Fix line length 2022-03-10 12:51:40 +02:00
Benoit Marty
ce4ad8819a
Merge pull request #5380 from vector-im/feature/bca/crypto_fix_rolling_uisi
Refactoring for safer olm and megolm session usage
2022-03-10 11:13:07 +01:00
ariskotsomitopoulos
45ee9f85e5 Check if the server supports MSC3440 using the stable flag from /versions api 2022-03-10 12:07:05 +02:00
ariskotsomitopoulos
03f293f216 Remove io.element.thread and add stable m.thread prefix 2022-03-10 12:06:02 +02:00
Adam Brown
d3fc3791bc Merge branch 'main' into develop 2022-03-09 21:33:16 +00:00
ariskotsomitopoulos
92c1bc944d Fix realm crash on v1.4.4 2022-03-09 20:03:42 +02:00
ericdecanini
2f706d6fae Replaces children state event room id with space id 2022-03-09 18:42:35 +01:00
ericdecanini
f76f73f8ad Refactors DefaultSpaceService querySpaceChildren 2022-03-09 18:36:56 +01:00
SpiritCroc
6c4e404ba1 Fix updating unread marker if not to latest chunk
SetReadMarkerTask was not updating the read marker when both the old and
the new fully read eventId weren't in the last chunk, even when the new
one was after the first one.
2022-03-09 18:02:53 +01:00
Adam Brown
60bc3b09b7 updating to version 1.4.6 in prep for next release cycle 2022-03-09 16:03:00 +00:00
ericdecanini
bbc6e8bbce Replaces caught Exception with HttpException 2022-03-09 16:41:18 +01:00