Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-24 14:58:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,638 Commits 530 Branches 158 Tags 486 MiB
cbd0a12422
Commit Graph

5021 Commits

Author SHA1 Message Date
Maxime NATUREL
5efe26c7dd Fix code quality issues 2022-05-25 14:05:14 +02:00
Maxime NATUREL
c07bc0890f WIP - unit tests 2022-05-25 14:05:14 +02:00
Maxime NATUREL
79212321a2 Deactivate all previous active beacons when receiving one from user 2022-05-25 14:05:12 +02:00
Maxime NATUREL
bec3f793f3 Improve query of current running live location shares 2022-05-25 14:04:22 +02:00
Maxime NATUREL
ca9591e423 Fix set of userId in aggregation process 2022-05-25 14:04:22 +02:00
Maxime NATUREL
3b06f18ccb Remove unused imports 2022-05-25 14:04:22 +02:00
Maxime NATUREL
7a7af40d61 Creation of LocationSharingService to get current users sharing their live locations 2022-05-25 14:04:20 +02:00
Michael Kaye
c59c5cfb4a Ignore all tests that have failed during testing. 2022-05-25 12:36:21 +01:00
Maxime NATUREL
791d4fb1e8 Improve computation of the work name to limit its length 2022-05-25 11:10:54 +02:00
Maxime NATUREL
8864a3cf2c Using replace instead of keep strategy for the worker 2022-05-25 11:06:02 +02:00
Maxime NATUREL
cfdc18d421 Improve code readability in aggregation processor 2022-05-25 11:05:28 +02:00
Maxime NATUREL
b081429725 Replace getOrCreate() by get() in worker 2022-05-25 10:59:08 +02:00
ericdecanini
c3209d7049 Manually fixes more formatting issues 2022-05-24 15:31:20 +02:00
ericdecanini
6c21a6b48d Separates some method parameters 2022-05-24 15:26:24 +02:00
Maxime NATUREL
683a9cdfff Schedule work during aggregation 2022-05-23 17:34:52 +02:00
Maxime NATUREL
47eb7173f0 Creation of a worker to deactivate a live after timeout 2022-05-23 17:34:52 +02:00
Maxime NATUREL
d76b93ced3 Adding comment on isActive field 2022-05-23 17:34:51 +02:00
ericdecanini
b3fdb5ed17 Changes code style when arrow alignment 2022-05-23 12:57:57 +02:00
ericdecanini
3f3662e605 Changes code style method parameters new line around parentheses to true 2022-05-23 12:30:42 +02:00
Benoit Marty
53c83ab8d8 Add missing punctuation 2022-05-20 21:22:47 +02:00
Benoit Marty
92d54dc733 Fix compilation issue 2022-05-20 21:14:42 +02:00
Benoit Marty
b86693580e class with private constructor instead of object 2022-05-20 21:14:42 +02:00
Benoit Marty
827c7e58f6 Package have been renamed, so also rename it here. 
Dokka does not complain about unknown package in this file :/
 2022-05-20 21:14:42 +02:00
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
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
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
Olivér Falvai
f036d35829 Merge branch 'develop' into dependency-cleanup 2022-05-19 12:27:09 +02:00
Michael Kaye
28c4abb505 Track number of retries of tests, and retry KeysBackupTest 2022-05-19 10:34:38 +01: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
Olivér Falvai
2dcc120cf7 Merge remote-tracking branch 'origin/develop' into dependency-cleanup 
# Conflicts:
#	build.gradle
#	dependencies.gradle
 2022-05-18 11:47:21 +02:00
Michael Kaye
f7303789a0
Merge pull request #6025 from vector-im/michaelk/skip_tests_failing_on_ci 
Improve test handling in CI
 2022-05-18 09:51:17 +01:00
Benoit Marty
8f7789f269 Version++ 2022-05-17 21:28:11 +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
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
1eb97f6cb8 Disable the undocumented warnings, there are too many :/ 2022-05-16 12:23:10 +02:00
Benoit Marty
dfe75de76e Add links to the doc (I've finally found a way to do it) 2022-05-16 12:23:10 +02:00
Benoit Marty
26e6d56cf1 Improve doc 2022-05-16 12:23:10 +02:00
Benoit Marty
6f29a7ab94 Also update TextMatrix 2022-05-16 12:23:10 +02:00
Benoit Marty
08c67eaf0e Remove unecessary indirection 2022-05-16 12:23:10 +02:00
Benoit Marty
3fc4083aca Make the constructor public 2022-05-16 12:23:10 +02:00
Benoit Marty
11e1fdf332 Remove the deprecated way to create a Matrix object 2022-05-16 12:23:10 +02:00
Benoit Marty
92c0d97110 Rename API 2022-05-16 12:22:18 +02:00
Benoit Marty
7040369529 Add documentation to the class Matrix 2022-05-16 12:22:18 +02:00
ariskotsomitopoulos
2e08c07dad Enhance decryption to prevent DUPLICATED_MESSAGE_INDEX when decrypting the same eventId 
Improve code format
 2022-05-16 13:05:38 +03:00
Benoit Marty
90035de5f2
Merge pull request #6047 from chagai95/add-presence-indicator-busy-and-away 
add presence indicator busy and away
 2022-05-16 11:26:11 +02:00
ericdecanini
83bd9bca86 Fixes lint error 2022-05-16 10:31:16 +02:00
Maxime NATUREL
4a2310954a Removing non necessary LiveLocationAggregationProcessor interface 2022-05-16 10:11:14 +02:00
Benoit Marty
4c95aafe10 Detekt: enable and fix EndOfSentenceFormat 2022-05-16 08:54:07 +02:00
Benoit Marty
9234c60155
Merge pull request #6038 from vector-im/feature/bma/detekt 
Detekt
 2022-05-13 23:40:53 +02:00
ericdecanini
50839c206b Adds flattenParents field to RoomSummary and corresponding mapping 2022-05-13 20:43:03 +02:00
chagai95
9f033ed623
add presence indicator busy and away 2022-05-13 13:55:10 +02:00
Onuray Sahin
47f43a88f4 Create dummy poll event for tests. 2022-05-13 14:04:33 +03:00
Onuray Sahin
85708b7c60 Fix related event id. 2022-05-13 12:59:41 +03:00
Valere
7d5570fd6f quick format 2022-05-13 09:36:42 +02:00
Benoit Marty
03ec9946ff Detekt: fix ConstructorParameterNaming 
UserProperties fix is also in https://github.com/matrix-org/matrix-analytics-events/pull/62
 2022-05-12 22:17:56 +02:00
Valere
8077406cba code review 2022-05-12 18:45:35 +02:00
Valere
5a323db7dc Unignore and improve tests 2022-05-12 18:45:35 +02:00
Valere
b25b30719a Add test to check MSK signature on backup 2022-05-12 18:45:35 +02:00
Valere
22e0506814 Prevent 4S / megolm backup desync + sign with MSK 2022-05-12 18:45:35 +02:00
Benoit Marty
c3b5ba5639 Detekt: fix MatchingDeclarationName 2022-05-12 17:44:44 +02:00
Benoit Marty
3bc84f0d38 Detekt: fix MaxLineLength 
@ouchadam your test fun names are too long!
 2022-05-12 17:38:49 +02:00
Benoit Marty
aeb6495253 Detekt: fix RethrowCaughtException 2022-05-12 17:32:00 +02:00
Benoit Marty
21904054a5 Detekt: ignore EmptyCatchBlock 2022-05-12 17:29:10 +02:00
Benoit Marty
a09e893a0b Detekt: fix MayBeConst 2022-05-12 17:24:15 +02:00
Benoit Marty
824f029e20 "TODO:" is forbidden by Detekt 2022-05-12 17:06:52 +02:00
Onuray Sahin
817428e295 Refactor ending polls. 2022-05-12 17:53:08 +03:00
Ahmed Radhouane Belkilani
6a523ccc38 Allow using the latest user avatar and display name for all messages in the timeline 
Signed-off-by: Jorge Martín Espinosa <jorgem@element.io>
 2022-05-12 15:43:20 +02:00
ericdecanini
52c404ac9c Merge remote-tracking branch 'origin/develop' into feature/eric/replace-search-room-subheader 2022-05-12 14:36:04 +02:00
Onuray Sahin
704e86d843 Refactor editing polls. 2022-05-12 12:22:27 +03:00
Benoit Marty
deb0f1ad1b
Merge pull request #6000 from vector-im/dependabot/gradle/androidx.preference-preference-ktx-1.2.0 
Bump preference-ktx from 1.1.1 to 1.2.0
 2022-05-11 16:17:17 +02:00
Benoit Marty
a963596a59
Merge pull request #6022 from vector-im/feature/bma/gh_pages 
Gh pages
 2022-05-11 14:28:19 +02:00
Valere
304cb07858
Merge pull request #5559 from vector-im/feature/bca/crypto_better_key_share 
Update/Revise SDK to implement reference flowchart for key sharing/forwarding + use backup
 2022-05-11 12:05:58 +02:00
Valere
3948f263df fix method visibility 2022-05-11 11:16:00 +02:00
Benoit Marty
27dcb6ef9c Add a note when generated from this project. 
A change will have to be done on the SDK project to remove this line before generated the documentation.
 2022-05-11 11:14:45 +02:00
Valere
992f477ab1 use clock time instead of system 2022-05-11 10:58:13 +02:00
Valere
546d6fe56d post merge fix 2022-05-11 10:42:02 +02:00
Benoit Marty
ff386c3de6 Fix lint internal issue: remove object Params. 
GetTurnServerTask.kt: Error: Unexpected failure during lint analysis of GetTurnServerTask.kt (this is a bug in lint or one of the libraries it depends on)
 2022-05-11 10:22:07 +02:00
Travis Ralston
019ec6c1c8
Merge pull request #5997 from vector-im/travis/spec/v1.3-edit/nothreads 
Remove spec v1.3 check for threads
 2022-05-10 14:47:48 -06:00
Travis Ralston
8570a1e0ad Fix missed test 2022-05-10 14:05:06 -06:00
Valere
12ab4787f1 Merge branch 'develop' into feature/bca/crypto_better_key_share 2022-05-10 19:30:52 +02:00
Benoit Marty
04cadb94cf
Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21 
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
 2022-05-10 18:23:51 +02:00
Benoit Marty
a3b6bb3ec3 Fix test compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 17:46:59 +02:00
Benoit Marty
f54aa60803 Fix test compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 17:00:54 +02:00
Benoit Marty
67cd82385a Fix warning: w: '-Xopt-in' is deprecated and will be removed in a future release, please use -opt-in instead 2022-05-10 16:07:24 +02:00
Benoit Marty
5c7ee5ef58 Fix compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 16:05:46 +02:00
Adam Brown
ece48baa9d
Merge pull request #5965 from vector-im/feature/adm/matrix-id-certificate 
Handling SSL/TLS errors during WellKnown lookup
 2022-05-10 12:17:48 +01:00
dependabot[bot]
6ed20589fb
Bump olm-sdk from 3.2.10 to 3.2.11 
Bumps olm-sdk from 3.2.10 to 3.2.11.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 23:10:42 +00:00
Travis Ralston
c63a5c0201 Remove spec v1.3 check for threads 
Citation: https://matrix.to/#/!ewdjhNcPcEmYNKzlWp:t2l.io/$CkPuvKdFZyFL547JCy5J3MfvLaWUo_a1XEdmiop1PKc?via=matrix.org&via=element.io&via=envs.net
 2022-05-09 16:36:43 -06:00
Maxime NATUREL
7aa958b9ff Fix getting related eventId for location events 2022-05-09 16:11:36 +02:00
Maxime NATUREL
b577f6ab8e Fix display in Bubble mode 2022-05-09 15:15:33 +02:00
Benoit Marty
e35ee03178 Try to workaround Dependabot issue #5961 2022-05-09 11:40:53 +02:00