Commit graph

5537 commits

Author SHA1 Message Date
Benoit Marty
8218d8f267 Typo: isStucked -> isStuck 2022-05-20 21:14:42 +02:00
Benoit Marty
8d74acf060 Fix post rebase issue 2022-05-20 21:14:42 +02:00
Benoit Marty
dc1eba2847 Improve documentation 2022-05-20 21:14:42 +02:00
Benoit Marty
d92875e3c2 Improve documentation 2022-05-20 21:14:42 +02:00
Benoit Marty
740acda60b Please ktlint. Ok, the user story will appear at the end of the doc. 2022-05-20 21:14:42 +02:00
Benoit Marty
853c0a25bf Method onSecretKeyGossip doe snot have to be in the public interface 2022-05-20 21:14:42 +02:00
Benoit Marty
ede784684f Change in KeysBackupService: isEnabled and isStucked are now fun, and state has been renamed to getState and is now a fun. 2022-05-20 21:14:42 +02:00
Benoit Marty
1ab4ae9eac Extract KeyRef to its own file 2022-05-20 21:14:42 +02:00
Benoit Marty
d3d17ebbcb Extract HttpPusher to its own file 2022-05-20 21:14:42 +02:00
Benoit Marty
768df330b5 Rename currentThreePid to getCurrentThreePid 2022-05-20 21:14:42 +02:00
Benoit Marty
e6c8ffd1b8 Change val to fun on the SDK interfaces.
Dokka will generate a better documentation (`Functions` and `Properties` are 2 distinct tab), and for Service it's better to have only `fun`
2022-05-20 21:14:42 +02:00
Benoit Marty
cfd6456614 Add other user stories (with TODO) 2022-05-20 21:14:42 +02:00
Benoit Marty
96c825e265 Create _userstories package and add the 2 first user stories 2022-05-20 21:14:42 +02:00
Benoit Marty
bad62be497 Use Kdoc format, else it's not extracted to the documentation by dokka 2022-05-20 21:14:42 +02:00
ariskotsomitopoulos
85f3592938 PR remarks 2022-05-20 17:03:15 +03:00
ariskotsomitopoulos
1bea28e27a fix documentation format 2022-05-20 16:03:39 +03:00
ariskotsomitopoulos
e323caa233 Merge branch 'develop' into feature/aris/crypto_replay_attack
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
2022-05-20 15:46:15 +03:00
ariskotsomitopoulos
c958d3a383 Merge branch 'develop' into feature/aris/crypto_replay_attack 2022-05-20 15:43:08 +03:00
ariskotsomitopoulos
7bc880e6bf Improve documentation 2022-05-20 15:33:29 +03:00
ganfra
58a1c80334 Fix crash on on crypto store open/close 2022-05-20 12:47:47 +02:00
ariskotsomitopoulos
2081e2c45b Reduce log visibility to verbose 2022-05-20 13:32:55 +03:00
Benoit Marty
4094a66f3c
Merge pull request #6084 from vector-im/feature/bma/detekt_outdated_doc
Feature/bma/detekt outdated doc
2022-05-20 12:06:34 +02:00
ganfra
21ef138e97 Add more logs on verif 2022-05-20 11:21:51 +02:00
Benoit Marty
b547a49ab3
Merge pull request #6089 from vector-im/feature/bma/real_fail
Ensure calling 'fail()' is not caught by the Exception handler
2022-05-20 10:33:02 +02:00
Benoit Marty
f5d0663b06 Remove non needed extra spaces 2022-05-20 09:48:17 +02:00
Benoit Marty
dae0b66c90 PR review 2022-05-20 09:48:05 +02:00
Benoit Marty
51fe7b9a93 Detekt: Fix OutdatedDocumentation 2022-05-20 09:48:05 +02:00
Benoit Marty
2a66e03742 Kdoc: remove unnecessary : 2022-05-20 09:47:54 +02:00
Michael Kaye
a4fa65b4fd Fix linting 2022-05-19 12:37:41 +01:00
Michael Kaye
fe793798fa Ignore E2eeSanityTests.
They fail infrequently, but in a way that takes the entire test framework down,
so ignore them for now and open an issue to fix.
2022-05-19 12:06:54 +01:00
Onuray Sahin
9adbeb8dd2 Fix import. 2022-05-19 14:04:37 +03:00
Onuray Sahin
1605ae1607 Merge branch 'develop' into feature/ons/poll_refactoring
* develop: (251 commits)
  Space explore rooms screen alignment with design in figma (#5834)
  leaving space aligned with ios (#5942)
  Fix usage of System.currentTimeMillis(). This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
  Update TimelinePreviousLastForwardTest.kt
  Changelog.d
  Rename 'getDomain' to 'getServerName'.
  Well-known lookups should not include the port of a server.
  Ah it was used in Gplay variant. Anyway I think we can still remove this now.
  Fix parsing of location data in non encrypted room
  Additionally increment for TimelinePreviousLastForwardTest
  Notify other devices of acceptance of verification request
  Instead of using a magic number, explicitly test for the events we expect.
  Adding comments on some strings and removing non necessary plural
  Remove ShortcutBadger lib and usage (it was dead code)
  Version++
  Fastlane file
  Towncrier
  Add `.login` to get the username of the PR merger.
  Rename folder for the PlayStore
  Remove empty translations
  ...

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
2022-05-19 13:39:43 +03:00
Michael Kaye
28c4abb505 Track number of retries of tests, and retry KeysBackupTest 2022-05-19 10:34:38 +01:00
ganfra
f559db62b9 Fix tests compilation 2022-05-18 18:48:37 +02:00
Michael Kaye
5260e729ac
Merge pull request #6095 from vector-im/michaelk/correct_well_known_behaviour
Well known lookups should be to port 443 only.
2022-05-18 16:50:43 +01:00
Michael Kaye
d57841c0d0
Merge pull request #6088 from vector-im/michaelk/fix_forward_pagination_test
In TimelineForwardPaginationTest, explicitly test for the events we expect
2022-05-18 16:50:09 +01:00
Michael Kaye
94411ed60e
Update TimelinePreviousLastForwardTest.kt
Update comments in line with code changes.
2022-05-18 16:34:39 +01:00
Michael Kaye
e66284fbd3 Rename 'getDomain' to 'getServerName'.
In the context of matrix IDs, this removes the leading @name: leaving the hostname or hostname and port.
2022-05-18 15:21:33 +01:00
Michael Kaye
7efd41e17a Well-known lookups should not include the port of a server. 2022-05-18 15:21:12 +01:00
Maxime NATUREL
738ce18a2f
Merge pull request #5989 from vector-im/feature/mna/PSF-884-location-view
[Location sharing] - Message for live sharing in timeline (PSF-884)
2022-05-18 15:39:51 +02:00
Benoit Marty
99d4bbe74b Fix bad copyright 2022-05-18 14:12:44 +02:00
Maxime NATUREL
4ebd1ea138 Fix parsing of location data in non encrypted room 2022-05-18 13:58:42 +02:00
ariskotsomitopoulos
5532e7dfa1 Fix copyright 2022-05-18 14:57:50 +03:00
Michael Kaye
261dadb986 Additionally increment for TimelinePreviousLastForwardTest 2022-05-18 12:37:07 +01:00
Onuray Sahin
3bf9ea5b06 Lint fixes. 2022-05-18 14:13:53 +03:00
ariskotsomitopoulos
b9adbb7d60 PR remarks 2022-05-18 14:05:58 +03:00
Onuray Sahin
7ce093e239 Code review fixes. 2022-05-18 13:39:12 +03:00
Jorge Martín
123ad87eda Notify other devices of acceptance of verification request 2022-05-18 12:31:32 +02:00
Benoit Marty
5c9281bc7e Ensure calling 'fail()' is not caught by the Exception handler 2022-05-18 12:26:09 +02:00
Michael Kaye
5a1545058b Instead of using a magic number, explicitly test for the events we expect.
This permits a clear error when the events are missing / extra and while
not making the test invulnerable to future changes in events, should be
explicit on what's changed.
2022-05-18 11:25:07 +01:00
ericdecanini
fe27451532 Fixes lint error 2022-05-18 12:09:34 +02:00
ericdecanini
61b8053b9b Moves LoginType to sdk api package 2022-05-18 11:23:34 +02:00
ariskotsomitopoulos
a0a7d3e7f6 Enhance reply attack to prevent DUPLICATED_MESSAGE_INDEX while decrypting the same event 2022-05-17 16:28:30 +03:00
ericdecanini
6a3044cb2e Fixes post merge errors 2022-05-17 14:46:02 +02:00
Onuray Sahin
edd35872f3 Fix ending poll power level condition. 2022-05-17 15:44:39 +03:00
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
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
ganfra
a559ebad64 Some more cleanup 2022-05-13 18:52:54 +02:00
ganfra
7e49bad411 Try to clean up after merging upstream develop 2022-05-13 17:26:26 +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
ganfra
725e56db08 Merge branch 'develop' of https://github.com/vector-im/element-android into feature/fga/rust_upstream_develop 2022-05-12 19:39:10 +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
ganfra
677c879979 Fix some code quality 2022-05-12 11:59:21 +02:00
Onuray Sahin
704e86d843 Refactor editing polls. 2022-05-12 12:22:27 +03:00
ganfra
a2b3839c46 Rust Migration: use realm migration mechanism 2022-05-11 19:20:39 +02: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
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
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
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
ganfra
88733784cd Add tests for extracting and migrate data 2022-05-10 15:17:12 +02:00
ganfra
f9f885418a Introduce TemporaryRealmConfigurationFactory rule 2022-05-10 15:16:46 +02:00
ganfra
4be50101b3 Temporary commenting other tests to make compile 2022-05-10 15:16:21 +02: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
ganfra
ae67e51d26 Add RustCryptoStoreMigrateUseCase 2022-05-06 19:15:35 +02:00
ganfra
ff17941cee Make it compile with latest rust lib 2022-05-06 19:14:59 +02:00
ganfra
4e6bed87e4 Introduce ExtractMigrationDataUseCase 2022-05-06 17:51:35 +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
ganfra
b4bc56ff5c Continue cleaning up/adding suspend 2022-05-06 16:12:53 +02:00
ericdecanini
be0be699e4 Fixes formatting errors in ExportEncryptionTest and VectorBaseActivity 2022-05-06 10:10:25 +02: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
0683085398 fixing crash on launch
- due to missing primary key migration in the live location
2022-05-05 17:11:48 +01:00
ganfra
69ede523b6 Update rust-crypto library 2022-05-05 14:35:42 +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
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
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
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
ganfra
8bd094fa66 Do some cleanup on verification APIs 2022-04-25 18:53:13 +02:00
ganfra
309a290cb8 Suspend: fix flow builders 2022-04-25 17:55:17 +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
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
ganfra
5581b82ab4 Let rust encrypt method handle unencrypted content ( like relates_to) 2022-04-22 12:14:04 +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
ganfra
39755b08ee Continue cleaning up code and fix some verification code 2022-04-21 20:09:08 +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
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
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
ganfra
48793f531c Start fixing crypto tests compilation 2022-04-15 20:05:06 +02:00
ganfra
9cb43ce4c8 Continue cleaning mostly on coroutine 2022-04-15 18:59:09 +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
ganfra
ba540eb861 Continue removing runBlocking + some cleanup 2022-04-15 11:17:06 +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
ganfra
d020d1f6e0 Use MatrixCoroutineDispatchers in OlmMachine 2022-04-14 16:33:48 +02: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
ganfra
91daa1ab90 Suspend: continue cleaning 2022-04-14 15:36:03 +02: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
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
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
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
ganfra
ed84e38a9b Suspend api: continue moving away from callback 2022-04-06 19:02:45 +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
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
57bf044df0 adding documentation to the new session listener 2022-04-01 16:57:23 +01:00
ganfra
9c6fccab1d Suspend API: continue moving verifications 2022-04-01 17:49:44 +02:00
ganfra
950c7f4a23 Fix verification not working 2022-04-01 17:49:08 +02: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
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
ganfra
046699bc84 Suspend API: handle cross signing service 2022-03-30 17:35:33 +02:00
ganfra
0590258d54 Suspend API: handle verification service 2022-03-29 17:51:05 +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
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
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
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
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
ericdecanini
bbc6e8bbce Replaces caught Exception with HttpException 2022-03-09 16:41:18 +01:00
Benoit Marty
7d78c8819c Ignore some other lint warnings 2022-03-09 14:40:59 +01:00
ericdecanini
70b5b9855a Removes debug global error 2022-03-09 12:26:52 +01:00
Benoit Marty
cbdc28dd9b
Merge pull request #5457 from vector-im/michaelk/ignore_flaky_test
Ignore flaky VerificationTest
2022-03-09 12:18:55 +01:00
Benoit Marty
02ba09900f
Merge pull request #5434 from vector-im/feature/nfe/space_unread_count_dm
include dms number in space unread number badge
2022-03-09 11:16:07 +01:00
ericdecanini
63cd79dc4f Removes debug logs 2022-03-09 10:53:18 +01:00
Benoit Marty
20c1886fed Support both unstable and stable prefixes.
Author: Onuray
2022-03-09 10:40:43 +01:00
ericdecanini
fb374b7374 Fixes wrong path parameter in getSpaceHierarchy 2022-03-09 09:57:20 +01:00
Valere
96b51744b6 Fix ktlint 2022-03-08 23:19:21 +01:00
ericdecanini
31f300c724 Adds error print stack trace 2022-03-08 21:32:13 +01:00
ericdecanini
54828f76cf Adds slash to v1 prefix path 2022-03-08 17:26:01 +01:00
ericdecanini
0892525c84 Adds debug logs 2022-03-08 17:19:11 +01:00
ericdecanini
82b5fc9557 Removes unused imports 2022-03-08 16:50:49 +01:00
ariskotsomitopoulos
a53d5bdba2 Remove eventType from /relations api for threads 2022-03-08 16:41:38 +02:00
ericdecanini
eb46067c08 Changes caught exception type to Throwable 2022-03-08 15:40:13 +01:00
Michael Kaye
67c9584215 Ignore flaky VerificationTest 2022-03-08 14:08:30 +00:00
ariskotsomitopoulos
8c6902aa23 Fix reply within thread edition 2022-03-08 14:50:27 +02:00
ericdecanini
e5299d716c Fixes legal comments 2022-03-08 13:15:26 +01:00
ericdecanini
0af6ae6075 Adds logic for using stable and unstable hierarchy endpoints 2022-03-08 13:10:18 +01:00
Onuray Sahin
7a1d3aa3f2 Filter poll response events in latest event query. 2022-03-08 14:07:14 +03:00
ericdecanini
bc3b8d0a16 Adds testing for fallback api 2022-03-08 11:51:17 +01:00
Michael Kaye
ab3f3fba68 Attempt to prevent the deprecated warning/error about Provider usage. 2022-03-08 10:38:23 +00:00
Michael Kaye
fb05731bb9 If no identity server configured, log at info, not warn. 2022-03-08 10:12:13 +00:00
SpiritCroc
768262094c Fix missing messages when forward paging with chunks > 50 messages
- offsets() was not limiting in the right direction when loading
  messages forwards
- after fixing offsets(), more recent messages would not be loaded due
  to the isLastForward() check, so better prioritize the SUCCESS
  LoadMoreResult over the REACHED_END here
2022-03-08 10:54:27 +01:00
ariskotsomitopoulos
557fd7eacf Replace thread timeline and thread summaries EventInsertType from INCREMENTAL_SYNC to PAGINATION 2022-03-08 10:13:56 +02:00
ericdecanini
3b0a565822 Changes room hierarchy endpoint 2022-03-07 16:51:40 +01:00
Michael Kaye
1569c2f3c7 Missing import of at-Ignore annotation. 2022-03-07 14:46:01 +00:00
Michael Kaye
f32da28285 Ignore ThreadMessagingTest as it seems to cause other integration tests to fail. 2022-03-07 13:14:38 +00:00
ericdecanini
6836a12557 Fixes legal comments 2022-03-07 13:49:23 +01:00
ericdecanini
e1f227a545 Fixes legal comments in matrix sdk files added 2022-03-07 13:14:10 +01:00
ericdecanini
0d75273121 Adds stubbing and verification for migration setRequired 2022-03-07 12:22:25 +01:00
ericdecanini
085dd943ff Fixes wrong legal comment on LoginType 2022-03-07 12:13:33 +01:00
ericdecanini
e8432f3140 Adds setRequired to migration 2022-03-07 12:07:41 +01:00
ericdecanini
6338941885 Temporarily removes unit tests 2022-03-07 10:28:48 +01:00
ericdecanini
858923846d Adds Uri static mocking 2022-03-07 09:56:44 +01:00
NIkita Fedrunov
a3dcee55e4 include dms number in space unread number badge 2022-03-07 08:35:53 +01:00
ariskotsomitopoulos
d19dd91d67 Format code 2022-03-05 20:49:11 +02:00
ariskotsomitopoulos
bce5bc8389 Fix wrong versioning regex pattern
Add MSC3440 support using /version/ and /capabilities
2022-03-05 17:13:02 +02:00
ericdecanini
9bd3254e41 Removes HomeServerConnectionConfigFixture in fake adapter 2022-03-04 23:27:21 +01:00
ericdecanini
7896bf9023 Removes HomeServerConnectionConfigFixture 2022-03-04 21:36:10 +01:00
ericdecanini
2d07b80ace Fixes broken migration test 2022-03-04 21:14:27 +01:00
ericdecanini
c996f876a2 Fixes Uri EMPTY must not be null 2022-03-04 21:10:52 +01:00
ericdecanini
489670cf6b Adds validation failed test for SessionParamsCreator 2022-03-04 21:07:12 +01:00
ericdecanini
bcd802d335 Changes login types in wizards 2022-03-04 20:58:30 +01:00
Valere
3c931d6f6d Save valid backup key before downloading keys 2022-03-04 19:21:19 +01:00
Valere
db84c679b4 Code review cleaning 2022-03-04 19:21:19 +01:00
Valere
99a07af9de Better comment
Co-authored-by: poljar <poljar@termina.org.uk>
2022-03-04 19:21:19 +01:00
Valere
31d3fe38aa Better comment
Co-authored-by: poljar <poljar@termina.org.uk>
2022-03-04 19:21:19 +01:00
Valere
7616e2d14c better comment
Co-authored-by: poljar <poljar@termina.org.uk>
2022-03-04 19:21:19 +01:00
Valere
5d952feef9 code review cleaning 2022-03-04 19:21:19 +01:00
Valere
ada83d0ba6 fix test 2022-03-04 19:21:19 +01:00
Valere
714e1d79b7 clean log level 2022-03-04 19:21:19 +01:00
Valere
6546f98858 use mutex on suspend and not synchronized 2022-03-04 19:21:19 +01:00
Valere
49d33f3a4b avoid duplicate userId on key download 2022-03-04 19:21:19 +01:00
Valere
87de51b184 Use loggerTag 2022-03-04 19:21:19 +01:00
Valere
b7bf39b99a resurrect unwedge test + cleaning 2022-03-04 19:21:19 +01:00
Valere
078ed1b2d1 dispatch network calls to io 2022-03-04 19:21:19 +01:00
Valere
f238739438 Clean ensure olm, fix unwedging, better logs 2022-03-04 19:21:19 +01:00
Valere
2d9beb67b4 extract test to dedicated class 2022-03-04 19:21:19 +01:00
Valere
122e785f14 clean test 2022-03-04 19:21:19 +01:00
Valere
2f665dd08f cleaning 2022-03-04 19:21:19 +01:00
Valere
11e888162c test forward better key 2022-03-04 19:21:19 +01:00
Valere
9eb0473d74 better logs 2022-03-04 19:21:19 +01:00
Valere
ade16a0aa1 protect race on prekey + logs 2022-03-04 19:21:19 +01:00
Valere
9b3c5d2153 Improve inbound group session cache + mutex 2022-03-04 19:21:19 +01:00
Valere
c97de48474 Added e2ee sanity tests 2022-03-04 19:21:19 +01:00
Valere
24c51ea41a Clean megolm import code 2022-03-04 19:21:19 +01:00
Valere
87d930819a Fix test compilation 2022-03-04 19:21:19 +01:00
Valere
9df5f17132 protect olm account access 2022-03-04 19:21:19 +01:00
Valere
33f9bc52cb Protect olm session from concurrent access 2022-03-04 19:21:19 +01:00
Valere
10ea166b2a Extract olm cache store 2022-03-04 19:21:19 +01:00
ericdecanini
bb2369dad2 Fixes broken tests due to uninitialised HomeServerConnectionConfig homeServerUri 2022-03-04 15:02:03 +01:00
ericdecanini
275505b3e6 Fixes lint errors 2022-03-04 14:53:16 +01:00
ericdecanini
2fda593c3c Adds login types to auth flows 2022-03-04 14:29:42 +01:00
ericdecanini
32bde5a344 Adds loginType UNSUPPORTED 2022-03-04 14:24:47 +01:00
ganfra
2f16a2ebd7 Clean up some code 2022-03-04 12:36:31 +01:00
ClaireG
2a9e582db5
Merge pull request #5405 from vector-im/cgizard/ISSUE-5402
[Create private room] Picture doesn't not displayed
2022-03-03 22:40:26 +01:00
ganfra
b8637ddaf2 Merge branch 'develop' of https://github.com/vector-im/element-android into rust_upstream_develop 2022-03-03 19:52:57 +01:00
ariskotsomitopoulos
daafddbe71 fix Realm crash 2022-03-03 19:10:40 +02:00
ericdecanini
ea53462107 Adds loginType to DefaultLegacySessionImporter 2022-03-03 17:54:45 +01:00
ericdecanini
40dee006dd Refactors SessionCreator with added tests 2022-03-03 17:51:50 +01:00
ariskotsomitopoulos
39bd437f75 Temp fix Realm crash 2022-03-03 17:04:08 +02:00
ericdecanini
47d5d09af2 Fixes lint errors 2022-03-03 14:46:11 +01:00
ericdecanini
d3d99dd3ba Replaces mocks with fixtures in fake json adapters 2022-03-03 13:21:04 +01:00
ericdecanini
b82efe95bd Moves test packages 2022-03-03 13:18:02 +01:00
ericdecanini
dffd568e14 Adds AuthTo005 realm migration 2022-03-03 13:14:49 +01:00
ariskotsomitopoulos
e4282e5f29 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/DefaultRelationService.kt
2022-03-03 13:56:59 +02:00
ariskotsomitopoulos
719e254bb4 Format Code 2022-03-03 13:51:41 +02:00
ariskotsomitopoulos
33b170077e force refresh home server capabilities 2022-03-03 13:49:53 +02:00
ariskotsomitopoulos
623e9257a5 Merge branch 'feature/aris/thread_live_thread_list' into feature/aris/threads_analytics 2022-03-03 12:56:12 +02:00
Benoit Marty
dd0d2e8101
Merge pull request #5383 from vector-im/dependabot/gradle/com.google.android.gms-oss-licenses-plugin-0.10.5
Bump oss-licenses-plugin from 0.10.4 to 0.10.5 - REQUIRE HUMAN INTERVENTION
2022-03-03 11:55:00 +01:00
ericdecanini
d33081c349 Refactors SessionParamsMapperTest by adding fake json adapters 2022-03-03 11:47:31 +01:00
ericdecanini
187502c358 Refactors SessionParamsMapperTest by adding fake moshi 2022-03-03 11:32:23 +01:00
ericdecanini
25e73e5bd0 Adds SessionParamsMapper tests 2022-03-03 10:56:07 +01:00
ericdecanini
209a442d5b Adds LoginType to SessionParams and its entity 2022-03-03 10:55:51 +01:00
Benoit Marty
4396390409 Fix lint error (false positive, but anyway, not used) 2022-03-02 22:14:54 +01:00
ericdecanini
448e8e001f Reimplements soft logout simulation 2022-03-02 14:51:22 +01:00
ariskotsomitopoulos
214e0efcd9 Add Markdown support to thread summaries and thread list 2022-03-02 13:47:08 +02:00
Tiago Loureiro
ad8809196f Fix overflow on media cache size 2022-03-01 13:12:46 -03:00
Filip Rakić
1216dde9c5 ignore KeysBackup tests 2022-03-01 13:16:01 +01:00
Benoit Marty
71aac37ec7
Merge pull request #5330 from vector-im/feature/fga/more_realm_fixing
Feature/fga/more realm fixing
2022-02-28 21:02:10 +01:00
ariskotsomitopoulos
e59f2bba0a Add analytics to threads 2022-02-28 17:13:06 +02:00
ariskotsomitopoulos
eda723c230 Remove fetching thread summaries when homeserver do not support MSC3440 2022-02-28 12:35:27 +02:00
Benoit Marty
ca8b69e377
Use correct copyright 2022-02-24 14:20:48 +01:00
ariskotsomitopoulos
8b254212af Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-02-24 12:45:08 +02:00
ganfra
f7c79a6de2 Realm: fix remaining frozen result 2022-02-23 18:02:02 +01:00
ganfra
beeee7c84b Realm: avoid opening realm if not necessary in ReadReceiptsSummaryMapper 2022-02-23 18:01:19 +01:00
ganfra
fb2ed9a7ac Rename getTimeLine to getTimeline to align naming. Also create TimelineEventDataSource. 2022-02-23 18:00:31 +01:00
Erik Johnston
7997435003 Also record next_batch 2022-02-23 11:23:05 +00:00
Erik Johnston
6105d7bea9
Log since token when doing an incremental sync
This aids debugging when `/sync` does something weird server side. Since we already log a line each time we do an incremental sync this shouldn't cause a problem.
2022-02-23 10:22:03 +00:00
Benoit Marty
ed80fe517d Revert recent change to fix a crash
`readReceiptsSummaryEntity.realm` is null
2022-02-22 21:06:41 +01:00
ariskotsomitopoulos
79c97ac512 Formating code 2022-02-22 20:59:22 +02:00
ariskotsomitopoulos
f7f363ce25 Fix wrong copyrights 2022-02-22 20:52:01 +02:00
ariskotsomitopoulos
2054c577f3 Fix quality check errors 2022-02-22 17:41:54 +02:00
ganfra
4cc80162ca Clean and add Changelog 2022-02-22 14:23:45 +01:00
ganfra
80d19fa497 Realm transactions: use Realm.WRITE_EXECUTOR (and use in Create/Join Room tasks) 2022-02-22 13:00:22 +01:00
ariskotsomitopoulos
9953d0d0ed Resolve realm migration conflicts 2022-02-22 13:57:43 +02:00
ganfra
d27acfa64f Read receipts: use RoomMember instead of User and avoid creating realm instance each time 2022-02-22 12:45:54 +01:00
ganfra
fcca75ee23 Realm: remove usage of freeze as it was not necessary (unique thread) 2022-02-22 12:45:10 +01:00
ariskotsomitopoulos
deb86d2e87 Resolve real migration conflicts 2022-02-22 13:18:09 +02:00
ariskotsomitopoulos
79a231f1dc Merge branch 'develop' into feature/aris/thread_live_thread_list
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
2022-02-22 12:52:55 +02:00
Benoit Marty
95c00a1cce Udpate comment 2022-02-21 17:52:26 +01:00
ariskotsomitopoulos
2b740a1ab6 Implement permalink support for /relations live thread timeline 2022-02-21 17:23:17 +02:00
ariskotsomitopoulos
f4f48b919e Improve home server capabilities for threads 2022-02-21 12:14:51 +02:00
ariskotsomitopoulos
83088bbe5a Introduce live thread summaries using the enhanced /messages API from MSC 3440
Add capabilities to support local thread list to not supported servers
2022-02-18 17:21:10 +02:00
Valere
48fffc3dcf Code review 2022-02-18 10:08:44 +01:00
Valere
3702ccd2ba Defensive coding to ensure encryption when room was once e2e 2022-02-18 10:01:09 +01:00
Benoit Marty
d1d26a98af
Merge pull request #5237 from vector-im/feature/mna/5123-room-tag-suggestion
#5123: @room tag suggestion
2022-02-17 15:40:54 +01:00
Benoit Marty
ac9f138fc0
Merge pull request #5185 from vector-im/feature/adm/decouple-matrix-creation
Decoupling Matrix creation from Application
2022-02-17 15:35:09 +01:00
Maxime Naturel
0a87486f65 Removing TODO 2022-02-17 14:19:17 +01:00
Maxime Naturel
10d196596c Unmocking check of permission to notify room 2022-02-17 11:23:00 +01:00
Maxime Naturel
49596dcea3 Mocking check of permission to notify room 2022-02-17 11:23:00 +01:00
Maxime Naturel
fb2401d0b1 Fixing parsing of outcoming messages for @room chip (missing incoming messages) 2022-02-17 11:23:00 +01:00
Maxime Naturel
82ac302843 Fixing avatar name when there is no room picture 2022-02-17 11:22:59 +01:00
Maxime Naturel
d8e28d7be9 Adding autocomplete for @room (missing correct first letter of avatar) 2022-02-17 11:22:59 +01:00
Maxime Naturel
38fdfb27e4 Creating sealed wrapper class for member items 2022-02-17 11:22:59 +01:00
Maxime Naturel
2d38786d02 Adding TODOs 2022-02-17 11:22:59 +01:00
Adam Brown
343b8bf08d
Incrementing schema version - fixes pre-release launch crash (#5245)
* updating the schema version to 25 to reflect the latest migration
* adding changelog entry
2022-02-16 12:29:08 +00:00
Adam Brown
5b851f1cb7 suppressing deprecated warning on an unused method 2022-02-14 16:33:35 +00:00
Adam Brown
8e0f5802f9 Merge branch 'feature/adm/decouple-matrix-creation' of github.com:vector-im/element-android into feature/adm/decouple-matrix-creation 2022-02-14 16:05:00 +00:00
Adam Brown
95df3e7e2b deprecating the Matrix.initialize and Matrix.getInstance entry points in favour of clients controlling their own instances 2022-02-14 16:04:47 +00:00
Adam Brown
d05af1cb04 providing more alternatives when Matrix.getInstance fails 2022-02-14 15:54:05 +00:00
ariskotsomitopoulos
830c38f50b format ktlint 2022-02-14 16:53:29 +02:00
ariskotsomitopoulos
e9e5d680a1 Fix realm migration from 25 to 26 2022-02-14 16:51:56 +02:00
ariskotsomitopoulos
f98b595d85 Merge branch 'develop' into feature/aris/threads_live_timeline
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo025.kt
2022-02-14 16:13:51 +02:00
Adam Brown
2eb417ab05
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-02-14 13:41:40 +00:00
Adam Brown
2f7f86b8bb
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-02-14 13:41:27 +00:00
ariskotsomitopoulos
27bc43c24c Fix realm migration 2022-02-14 15:33:51 +02:00
Benoit Marty
43d6a29ff3
Merge pull request #5208 from vector-im/feature/adm/personalisation-capabilities
MSC3283 - Supporting additional homeserver capabilities
2022-02-14 14:27:26 +01:00
ariskotsomitopoulos
f1b11df781 Merge branch 'develop' into feature/aris/threads_live_timeline
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
2022-02-14 15:17:55 +02:00
ariskotsomitopoulos
83d937b842 format ktlint 2022-02-14 15:10:30 +02:00
ariskotsomitopoulos
49b7726ac8 - Integrate /relations API to create a live thread timeline 2022-02-14 15:09:01 +02:00
Adam Brown
fd2d9287e7 creating separate creator for the matrix instance to avoid ambiguous non singleton/duplicated singleton usages
- also documents the static methods
2022-02-14 12:46:16 +00:00
Adam Brown
fed549f647 reusing refresh extension 2022-02-14 12:05:57 +00:00
Adam Brown
4519dec7eb scheduling a refresh of the homeserver capabilities on introduction of new fields 2022-02-14 12:05:44 +00:00
Adam Brown
d19e6d290f
Merge pull request #5209 from vector-im/michaelk/reduce_debug_logging_loop
Reduce verbosity of CleanupSession debug logs.
2022-02-11 16:28:26 +00:00
ganfra
f1376eac82
Merge pull request #5204 from vector-im/feature/fga/reactions_ui_improvements
Feature/fga/reactions UI improvements
2022-02-11 15:17:44 +01:00
Adam Brown
d8d6358d15 adding support for the homeserver display name and avatar capabilities
- MSC3283 https://github.com/matrix-org/synapse/pull/11933
- includes session database migration
2022-02-11 12:48:42 +00:00
Adam Brown
a5f4413f6c using a generic boolean capability model for booleans 2022-02-11 11:52:41 +00:00
Adam Brown
5af56f6b5d
Merge pull request #5134 from vector-im/feature/bma/realmMigrations
Refactor realm migrations
2022-02-11 11:50:50 +00:00
Michael Kaye
f44f37629a Reduce verbosity of CleanupSession debug logs.
Currently we wait up to 10s for this operation to complete.

Replacing the two log lines with three, lets us halve the number of logs printed every 10ms,
but always print exactly one log line each iteration of the loop. Rather than:

```
02-10 19:58:48.880  3140  3140 D CleanupSession: Wait for all Realm instance to be closed (29 - 0)
02-10 19:58:48.880  3140  3140 D CleanupSession: Waiting 10ms
02-10 19:58:48.890  3140  3140 D CleanupSession: Wait for all Realm instance to be closed (29 - 0)
02-10 19:58:48.890  3140  3140 D CleanupSession: Waiting 10ms
02-10 19:58:48.900  3140  3140 D CleanupSession: Wait for all Realm instance to be closed (29 - 0)
02-10 19:58:48.900  3140  3140 D CleanupSession: Waiting 10ms
02-10 19:58:48.910  3140  3140 D CleanupSession: Wait for all Realm instance to be closed (29 - 0)
02-10 19:58:48.910  3140  3140 D CleanupSession: Waiting 10ms
02-10 19:58:48.920  3140  3140 D CleanupSession: Wait for all Realm instance to be closed (0 - 0)
```

We'll print:

```
02-10 19:58:48.880  3140  3140 D CleanupSession: Waiting 10ms for all Realm instance to be closed (29 - 0)
02-10 19:58:48.890  3140  3140 D CleanupSession: Waiting 10ms for all Realm instance to be closed (29 - 0)
02-10 19:58:48.900  3140  3140 D CleanupSession: Waiting 10ms for all Realm instance to be closed (29 - 0)
02-10 19:58:48.910  3140  3140 D CleanupSession: Waiting 10ms for all Realm instance to be closed (29 - 0)
02-10 19:58:48.920  3140  3140 D CleanupSession: Finished waiting for all Realm instance to be closed (0 - 0)
```

The above example took 40ms to finish and saved 4 log lines; you can see how it adds up if you take 10000ms to finish.
2022-02-11 09:06:47 +00:00
ganfra
f08b10b2c5
Merge pull request #5199 from vector-im/feature/dla/fix_timeline_from_virtual_rooms
Rooms with virtual rooms do not render the merged timeline with call events.
2022-02-10 19:20:01 +01:00
ganfra
9f44ec1d70 Reactions: fix ui echo ordering 2022-02-10 18:56:39 +01:00
David Langley
eb90268cf5 Updates getAccountDataEvents function to match it's description. 2022-02-10 10:30:47 +00:00
fedrunov
06b5563ff6
join and leave methods moved from MembershipService to RoomService an… (#5183) 2022-02-10 10:05:03 +01:00
Adam Brown
2d80c6bc4e avoiding using the matrix getInstance internally within the sdk to allow us to inject a consistent instance 2022-02-08 14:02:39 +00:00
Aris Kotsomitopoulos
077c0eea98
Revert "AGP 7.1.0" 2022-02-04 12:20:20 +02:00
Benoit Marty
eed4bf175f Realm migrations are not objects anymore
SchemaVersion is now a val
2022-02-03 21:05:54 +01:00
Benoit Marty
8a4ecf616a Split the classes RealmMigration into smaller classes 2022-02-03 21:05:54 +01:00
ganfra
2e2da16a6b Bubbles: merge develop 2022-02-03 17:10:13 +01:00
Benoit Marty
dba9a47c63
Merge pull request #5127 from vector-im/feature/ons/generic_location_pin
Support generic location pin
2022-02-03 16:02:38 +01:00
Benoit Marty
105118f831 Merge hotfix 1.3.18 to develop 2022-02-03 15:48:51 +01:00
Benoit Marty
09cbd146e8 Improve missing state event detection to missing state events only one joined rooms (ignore LEFT room)
Should reduce the number of initial sync
Co-authors: ganfra and billcarsonfr
2022-02-03 14:53:17 +01:00
Benoit Marty
664bccf8a5 ktlint 2022-02-03 00:27:10 +01:00
Benoit Marty
c66849834a
Merge pull request #5051 from vector-im/feature/bma/cleanup
Remove some usage of MatrixCallback
2022-02-03 00:25:54 +01:00
ganfra
85af3767b7 Sync: avoid deleting root event of CurrentState on gappy sync 2022-02-02 18:07:39 +01:00
Onuray Sahin
c2daab4211 Code review fixes. 2022-02-02 19:33:34 +03:00
Adam Brown
e2d8c73761 fixing push notifications being skipped
- reworking the isEventRead logic to always check if the new event exists locally, there's a race condition between eventFastLane and syncs where we end up mark unseen events as read if our last local message in a room is from ourselves
- this may also fix some  events being instantly marked as read when being received
2022-02-02 12:32:42 +00:00
ganfra
1bf2523437 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-02 13:01:43 +01:00
Onuray Sahin
a131d28b3e Merge branch 'develop' into feature/ons/generic_location_pin
* develop: (146 commits)
  exhaustive not needed anymore
  Invert if condition and split long line
  Use kotlin string builder
  Same issue but in the test
  Format
  Fix a crash: java.util.IllegalFormatPrecisionException https://github.com/matrix-org/element-android-rageshakes/issues/33398
  add changelog file for threads feature
  add changelog file for threads feature
  Formatting
  Improve hidden events for threads
  Add TODO for the next Weblate sync
  ktlint format
  PR remarks
  Fix a lint false positive? Anyway this was not used. Restricted API ../../../matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt:61: ListenableWorker.getTaskExecutor can only be called from within the same library group (referenced groupId=androidx.work from groupId=element-android)
  It seems that now lint rule `MissingQuantity` is an error and not a warning by default.
  Whitelist group 'org.webjars' on MavenCentral to fix lint execution
  Fix conflicts
  Formating & remove unused comments
  Fix error in unit test
  ktlint format
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
2022-02-02 14:35:30 +03:00
Onuray Sahin
37d35c9a7f Support generic location pin. 2022-02-02 14:25:54 +03:00
Benoit Marty
7a44f16372 More cleanup 2022-02-02 11:38:09 +01:00
Benoit Marty
4893429d73 Remove usage of MatrixCallback 2022-02-02 11:38:09 +01:00
Benoit Marty
2bf36c74e3 Use kotlin string builder 2022-02-02 10:46:31 +01:00
Benoit Marty
581dbda2c1 Format 2022-02-02 10:34:08 +01:00
Benoit Marty
cd1171eb9d Fix a crash: java.util.IllegalFormatPrecisionException
https://github.com/matrix-org/element-android-rageshakes/issues/33398
2022-02-02 10:33:19 +01:00
Aris Kotsomitopoulos
3d5f8ed7e7
Merge pull request #4746 from vector-im/feature/aris/threads
Threads P0 Release
2022-02-01 15:58:32 +02:00
Benoit Marty
79b4c76a09
Merge pull request #5082 from vector-im/feature/bma/agp_7_1_0
AGP 7.1.0
2022-02-01 13:57:15 +01:00
ariskotsomitopoulos
fcc095a239 PR remarks 2022-02-01 12:13:10 +02:00
ganfra
825c2ca989 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-01 10:05:51 +01:00
Benoit Marty
c8ddb2e85e Fix a lint false positive? Anyway this was not used.
Restricted API
../../../matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt:61: ListenableWorker.getTaskExecutor can only be called from within the same library group (referenced groupId=androidx.work from groupId=element-android)
2022-02-01 00:30:30 +01:00
ariskotsomitopoulos
d509b3324c Merge branch 'develop' into feature/aris/threads 2022-01-31 15:58:12 +02:00
Benoit Marty
91e444ca73
Merge pull request #5084 from vector-im/feature/bma/location_crash
Fix location crash
2022-01-31 14:42:53 +01:00
Adam Brown
9119cf059f adding extra logging around the push rules to help determine if we're incorrectly filter out valid notifications 2022-01-31 12:06:21 +00:00
ariskotsomitopoulos
26eaa843b3 ktlint format 2022-01-31 13:56:17 +02:00
ariskotsomitopoulos
3253a252fb Introduce ThreadsService by splitting TimelineService 2022-01-31 12:58:19 +02:00
Benoit Marty
83ed80e6d8 Rename fun for clarity 2022-01-29 07:40:41 +01:00
ariskotsomitopoulos
b1067e9a58 - ktlint format
- Update a text resource
2022-01-28 16:37:59 +02:00
ariskotsomitopoulos
1d6d8102b3 Further improve thread summary after forward scrolling 2022-01-28 14:11:03 +02:00
ganfra
c14eb050b1 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-27 18:59:10 +01:00
ariskotsomitopoulos
78dfac52a7 ktlint format 2022-01-27 18:39:43 +02:00
ariskotsomitopoulos
b2a2fe2710 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
2022-01-27 17:11:26 +02:00