jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,901 Commits 4 Branches 3 Tags 186 MiB
Commit Graph

4824 Commits

Author SHA1 Message Date
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
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 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
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
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
chagai95 9f033ed623
add presence indicator busy and away 2022-05-13 13:55:10 +02: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
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
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