Commit graph

9893 commits

Author SHA1 Message Date
Benoit Marty
afd2804ed3
Merge branch 'develop' into feature/mna/PSF-884-location-view 2022-05-16 14:42:38 +02:00
Benoit Marty
12eb23b198
Merge branch 'develop' into feature/bma/detekt_end_period 2022-05-16 13:14:37 +02:00
Benoit Marty
480a60a655 Exclude some files from check 2022-05-16 12:23:10 +02:00
Benoit Marty
9e106990c8 Setup knit 2022-05-16 12:23:10 +02:00
Benoit Marty
f1995503ff Small improvement on lint.xml file 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
92c0d97110 Rename API 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
c25845b959 Detekt: enable and fix EndOfSentenceFormat for analytics plan
Will require https://github.com/matrix-org/matrix-analytics-events/pull/63 for long term solution
2022-05-16 10:56:29 +02:00
chagai95
c27958d772
Add Busy string and change Unavailable to Away 2022-05-16 10:50:58 +02:00
Maxime NATUREL
3d136112b2 Fix filename 2022-05-16 10:39:46 +02:00
Maxime NATUREL
b0773514ee Extracting LocationLiveMessageBannerViewState into separated file 2022-05-16 10:32:34 +02:00
Maxime NATUREL
2aeee79c63 Using existing common When case for NoticeItem to handle location data 2022-05-16 10:14:39 +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
Valere
d40f8b0c56
Merge pull request #5939 from vector-im/feature/bca/fix_5906
Desynchronized 4S | Megolm backup causing Unusable backup
2022-05-13 15:43:18 +02:00
chagai95
9f033ed623
add presence indicator busy and away 2022-05-13 13:55:10 +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
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
22e0506814 Prevent 4S / megolm backup desync + sign with MSK 2022-05-12 18:45:35 +02: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
21904054a5 Detekt: ignore EmptyCatchBlock 2022-05-12 17:29:10 +02:00
Benoit Marty
cdbc9db890 Detekt: fix EmptyDefaultConstructor 2022-05-12 17:25:16 +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
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
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
2ec86fe9e6 Remove remaining dead code about flair
Finish the work started at #5664
2022-05-11 10:52:55 +02:00
Maxime NATUREL
b2099b6b31 Updating the no location map background 2022-05-11 10:34:54 +02:00
Maxime NATUREL
cb5c6ec35e Decreasing alpha of bottom banner in message view 2022-05-11 09:53:42 +02: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
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
fe8648c7f8 Fix compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 16:19:53 +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
5ad2567633 Fix compilation error after bump preference-ktx from 1.1.1 to 1.2.0 2022-05-10 15:00:44 +02:00
Benoit Marty
eafe65b417
Merge pull request #5831 from emotionalamoeba/develop
Updated copy and moved override in profile screen
2022-05-10 14:40:40 +02:00
Onuray Sahin
185cd316c9
Merge pull request #5911 from vector-im/feature/ons/voip_screen_sharing
Screen sharing over WebRTC
2022-05-10 13:06:33 +03:00
Adam Brown
33c1e1ea11 EMS section is temporarily hidden whilst we sync with marketing 2022-05-10 10:55:46 +01:00
Onuray Sahin
bb862cc509 Lower alpha of video button while screen sharing. 2022-05-10 11:35:38 +03:00
Benoit Marty
396d13c3f9
Merge pull request #6001 from vector-im/dependabot/gradle/androidx.media-media-1.6.0
Bump media from 1.4.3 to 1.6.0
2022-05-10 09:58:06 +02:00
dependabot[bot]
71b45947cb
Bump emoji2 from 1.0.1 to 1.1.0
Bumps emoji2 from 1.0.1 to 1.1.0.

---
updated-dependencies:
- dependency-name: androidx.emoji2:emoji2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 23:10:49 +00:00
dependabot[bot]
427a548e8b
Bump media from 1.4.3 to 1.6.0
Bumps media from 1.4.3 to 1.6.0.

---
updated-dependencies:
- dependency-name: androidx.media:media
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 23:08:08 +00:00