Commit Graph

15949 Commits

Author SHA1 Message Date
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
Adam Brown
cad9d443be
Merge pull request #6013 from vector-im/feature/adm/hide-ftue-ems
FTUE - Temporarily hide EMS section
2022-05-12 18:09:28 +01: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
David Langley
44e8974c02 direction and track need to be set for hold/unhold 2022-05-12 17:01:44 +01:00
Benoit Marty
6f3b9c78b0 Detekt: fix FunctionParameterNaming 2022-05-12 17:56:05 +02:00
Benoit Marty
c303b9afd3 Ignore more rules 2022-05-12 17:54:30 +02:00
Benoit Marty
f02bad5c79 Detekt: fix ArrayPrimitive 2022-05-12 17:54:15 +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
c19563bed2 Detekt: fix UtilityClassWithPublicConstructor 2022-05-12 17:26:11 +02:00
Benoit Marty
cdbc9db890 Detekt: fix EmptyDefaultConstructor 2022-05-12 17:25:16 +02:00
Benoit Marty
a09e893a0b Detekt: fix MayBeConst 2022-05-12 17:24:15 +02:00
Benoit Marty
c5f9546605 Ignore more rules 2022-05-12 17:23:41 +02:00
Benoit Marty
824f029e20 "TODO:" is forbidden by Detekt 2022-05-12 17:06:52 +02:00
Benoit Marty
d8cda04e14 We won't use this 2022-05-12 17:05:34 +02:00
Benoit Marty
7d6c27eed5 Ignore rule 2022-05-12 17:05:19 +02:00
Benoit Marty
911bfe2081 Let GA run detekt 2022-05-12 17:02:22 +02:00
Benoit Marty
9834371e18 Detekt: configure and ignore some rules. 2022-05-12 16:56:49 +02:00
Benoit Marty
c02fb87bc9 Set up detekt gradle plugin 2022-05-12 16:41:36 +02:00
Jorge Martin Espinosa
3f8ddbec60
Merge pull request #5817 from vector-im/arb/pse-329
Using the same User Avatar and display name for all messages in the timeline
2022-05-12 16:23:11 +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
f54c865cf4
Merge pull request #5756 from vector-im/feature/bma/pr_doc_update
Update doc about PR
2022-05-12 15:03:03 +02:00
Suguru Hirahara
bea8b3d8d1 Translated using Weblate (Japanese)
Currently translated at 96.7% (2152 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2022-05-12 12:59:44 +00:00
Stefan Schmidt
284fb639bf Translated using Weblate (German)
Currently translated at 97.3% (2166 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2022-05-12 12:59:43 +00:00
Sveinn í Felli
b95ca0ae53 Translated using Weblate (Icelandic)
Currently translated at 81.9% (1823 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/is/
2022-05-12 12:59:43 +00:00
ariskotsomitopoulos
40de685f1a Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements
# 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/search/SearchResultController.kt
2022-05-12 14:41:38 +03:00
Benoit Marty
4309fdba7e
Merge pull request #6021 from vector-im/feature/bma/finish_remove_flair
Remove remaining dead code about flair
2022-05-12 11:31:42 +02:00
Adam Brown
e56f6e910c
Merge pull request #6030 from vector-im/dependabot/gradle/mockk-1.12.4
Bump mockk from 1.12.3 to 1.12.4
2022-05-12 08:42:33 +01:00
dependabot[bot]
d3ecc8e5c3
Bump mockk from 1.12.3 to 1.12.4
Bumps `mockk` from 1.12.3 to 1.12.4.

Updates `mockk` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.3...1.12.4)

Updates `mockk-android` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.3...1.12.4)

---
updated-dependencies:
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.mockk:mockk-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-11 23:11:45 +00:00
Benoit Marty
cd509accdb
Merge pull request #5936 from hanthor/develop
Added themed icon for Android 13
2022-05-11 17:34:38 +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
1ef5416b50 Use the correct lint rule to ignore. 2022-05-11 15:02:01 +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
Michael Kaye
3769dad30e Github action should refer to result is 'success', not status is "success". 2022-05-11 11:09:01 +01: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
Benoit Marty
79982af8d1 Revert "Temporary trigger the doc generation on pull request to check the workflow"
This reverts commit 7f2484ca4c.
2022-05-11 11:47:36 +02:00
Valere
3948f263df fix method visibility 2022-05-11 11:16:00 +02:00
Benoit Marty
7f2484ca4c Temporary trigger the doc generation on pull request to check the workflow 2022-05-11 11:15:46 +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
Benoit Marty
a7d85cf9fd Setup GitHub action to generate the documentation of the SDK from develop branch 2022-05-11 11:00:24 +02:00
Valere
992f477ab1 use clock time instead of system 2022-05-11 10:58:13 +02:00
Benoit Marty
2ec86fe9e6 Remove remaining dead code about flair
Finish the work started at #5664
2022-05-11 10:52:55 +02:00
Valere
546d6fe56d post merge fix 2022-05-11 10:42:02 +02:00
Maxime NATUREL
b2099b6b31 Updating the no location map background 2022-05-11 10:34:54 +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