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
ariskotsomitopoulos
a0a7d3e7f6
Enhance reply attack to prevent DUPLICATED_MESSAGE_INDEX while decrypting the same event
2022-05-17 16:28:30 +03:00
Onuray Sahin
edd35872f3
Fix ending poll power level condition.
2022-05-17 15:44:39 +03: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
chagai95
9f033ed623
add presence indicator busy and away
2022-05-13 13:55:10 +02:00
Onuray Sahin
47f43a88f4
Create dummy poll event for tests.
2022-05-13 14:04:33 +03:00
Onuray Sahin
85708b7c60
Fix related event id.
2022-05-13 12:59:41 +03:00
Valere
7d5570fd6f
quick format
2022-05-13 09:36:42 +02:00
Benoit Marty
03ec9946ff
Detekt: fix ConstructorParameterNaming
...
UserProperties fix is also in https://github.com/matrix-org/matrix-analytics-events/pull/62
2022-05-12 22:17:56 +02:00
Valere
8077406cba
code review
2022-05-12 18:45:35 +02:00
Valere
5a323db7dc
Unignore and improve tests
2022-05-12 18:45:35 +02:00
Valere
b25b30719a
Add test to check MSK signature on backup
2022-05-12 18:45:35 +02:00
Valere
22e0506814
Prevent 4S / megolm backup desync + sign with MSK
2022-05-12 18:45:35 +02:00
Benoit Marty
c3b5ba5639
Detekt: fix MatchingDeclarationName
2022-05-12 17:44:44 +02:00
Benoit Marty
3bc84f0d38
Detekt: fix MaxLineLength
...
@ouchadam your test fun names are too long!
2022-05-12 17:38:49 +02:00
Benoit Marty
aeb6495253
Detekt: fix RethrowCaughtException
2022-05-12 17:32:00 +02:00
Benoit Marty
21904054a5
Detekt: ignore EmptyCatchBlock
2022-05-12 17:29:10 +02:00
Benoit Marty
a09e893a0b
Detekt: fix MayBeConst
2022-05-12 17:24:15 +02:00
Benoit Marty
824f029e20
"TODO:" is forbidden by Detekt
2022-05-12 17:06:52 +02:00
Onuray Sahin
817428e295
Refactor ending polls.
2022-05-12 17:53:08 +03:00
Ahmed Radhouane Belkilani
6a523ccc38
Allow using the latest user avatar and display name for all messages in the timeline
...
Signed-off-by: Jorge Martín Espinosa <jorgem@element.io>
2022-05-12 15:43:20 +02:00
ericdecanini
52c404ac9c
Merge remote-tracking branch 'origin/develop' into feature/eric/replace-search-room-subheader
2022-05-12 14:36:04 +02:00
Onuray Sahin
704e86d843
Refactor editing polls.
2022-05-12 12:22:27 +03:00
Benoit Marty
deb0f1ad1b
Merge pull request #6000 from vector-im/dependabot/gradle/androidx.preference-preference-ktx-1.2.0
...
Bump preference-ktx from 1.1.1 to 1.2.0
2022-05-11 16:17:17 +02:00
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
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
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
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
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
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
TarasSmakula
2839d1467f
Feature/5575 custom auth params for sign up ( #5577 )
...
Add a fun `RegistrationWizard.registrationCustom()` to be able to use any parameters during the registration.
Move terms converter into `api` package.
2022-04-21 20:02:27 +00:00
Benoit Marty
96350b0ed0
Merge pull request #5813 from vector-im/feature/bma/query
...
Improve code in file TimelineEventEntityQueries.kt
2022-04-21 21:11:30 +02:00
Maxime NATUREL
914db8c6be
Removing BeaconInfo structure
2022-04-21 15:52:16 +02:00
Benoit Marty
dbc558afbc
More cleanup in TimelineEventEntityQueries.kt
2022-04-21 14:37:56 +02:00
Benoit Marty
7f09a37503
Move code to TimelineEventEntityQueries.kt ( #5810 )
2022-04-21 14:27:17 +02:00
Eric Decanini
c21ec983e8
Merge pull request #5805 from vector-im/task/eric/format-project
...
Formats project with new code style
2022-04-21 12:43:28 +02:00
Benoit Marty
863ed2f15d
Move `GetPushRulesResponse` to internal package
2022-04-21 12:30:34 +02:00
Benoit Marty
4def1e6068
Rename internal package from `notification` to `pushrules`
2022-04-21 12:30:11 +02:00
Benoit Marty
729a2e6372
Move `pushrules` package to the `session` package
2022-04-21 12:30:11 +02:00
Eric Decanini
aebdee1070
Merge pull request #5652 from vector-im/bugfix/eric/sending-images-crashes
...
Potentially fixes intermittent crashing from sending gallery images
2022-04-21 11:54:59 +02:00
ericdecanini
de899bbb18
Formats entire project
2022-04-21 11:50:15 +02:00
Benoit Marty
7f3e72b9cb
Merge pull request #5772 from vector-im/feature/bma/ignore_users
...
Delete Events from ignored users and trigger a clear cache request dialog when unignoring user(s)
2022-04-21 11:03:09 +02:00
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
Benoit Marty
903e226e59
Restart the timeline when some Event are deleted, for instance when ignoring a user, for the change to take effect
2022-04-15 16:30:09 +02:00
ariskotsomitopoulos
1a38b8c3c9
Replace var with val
2022-04-15 16:32:48 +03:00
Benoit Marty
cc8f086cc3
copyright
2022-04-15 13:32:30 +02:00
Benoit Marty
cdcf57659f
Do not update the cache manually, else the initial sync request will not be triggered.
2022-04-15 12:54:04 +02:00
Benoit Marty
6b9f2965da
Request an initial sync when a user is unignored ( #1899 )
2022-04-15 12:07:28 +02:00
Benoit Marty
6ed1516d90
Delete messages from just ignored users from our database ( #1899 )
2022-04-15 11:15:08 +02:00