Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-29 15:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,001 Commits 531 Branches 158 Tags 486 MiB
52ed7c019b
Commit Graph

9857 Commits

Author SHA1 Message Date
ganfra
c1961d1fda DeviceId should be non-null so we can inject it properly and OlmMachine too. 2022-06-06 14:53:56 +02:00
ganfra
14ed4692dc
Merge branch 'rust' into feature/fga/device_verification 2022-06-02 15:42:25 +02:00
ganfra
c253f6b06f Clean more code 2022-05-31 16:16:56 +02:00
ganfra
b0aae84727 Use BackupRecoveryKey instead of plain string 2022-05-25 14:45:31 +02:00
ganfra
a559ebad64 Some more cleanup 2022-05-13 18:52:54 +02:00
ganfra
7e49bad411 Try to clean up after merging upstream develop 2022-05-13 17:26:26 +02:00
ganfra
725e56db08 Merge branch 'develop' of https://github.com/vector-im/element-android into feature/fga/rust_upstream_develop 2022-05-12 19:39:10 +02:00
ganfra
677c879979 Fix some code quality 2022-05-12 11:59:21 +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
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
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
Benoit Marty
07c22e7a19
Merge pull request #5988 from vector-im/dependabot/gradle/com.arthenica-ffmpeg-kit-audio-4.5.1-1 
Bump ffmpeg-kit-audio from 4.5.LTS to 4.5.1-1
 2022-05-09 22:04:19 +02:00
Benoit Marty
e35bb772c1
Merge pull request #5941 from vector-im/feature/bma/konfetti_speed 
No animation -> no chat effect
 2022-05-09 17:05:53 +02:00
Benoit Marty
96b0a3f760
Merge pull request #5986 from vector-im/dependabot/gradle/com.nulab-inc-zxcvbn-1.7.0 
Bump zxcvbn from 1.5.2 to 1.7.0
 2022-05-09 17:02:10 +02:00
Onuray Sahin
3a02e8405d Disable video toggle button during screen sharing. 2022-05-09 17:26:35 +03:00
Benoit Marty
c9677c8b5a
LTS version 2022-05-09 15:36:20 +02:00
Benoit Marty
9b4c861545
(try to) ensure LTS version will not be removed by mistake 2022-05-09 15:36:10 +02:00
dependabot[bot]
d567796928
Bump ffmpeg-kit-audio from 4.5.LTS to 4.5.1-1 
Bumps [ffmpeg-kit-audio](https://github.com/tanersener/ffmpeg-kit) from 4.5.LTS to 4.5.1-1.
- [Release notes](https://github.com/tanersener/ffmpeg-kit/releases)
- [Commits](https://github.com/tanersener/ffmpeg-kit/commits)

---
updated-dependencies:
- dependency-name: com.arthenica:ffmpeg-kit-audio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 13:26:46 +00:00
dependabot[bot]
24e36eb8af
Bump zxcvbn from 1.5.2 to 1.7.0 
Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.5.2 to 1.7.0.
- [Release notes](https://github.com/nulab/zxcvbn4j/releases)
- [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nulab/zxcvbn4j/compare/1.5.2...1.7.0)

---
updated-dependencies:
- dependency-name: com.nulab-inc:zxcvbn
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 13:25:08 +00:00
dependabot[bot]
718516a0c3
Bump lazythreetenbp from 0.9.0 to 0.10.0 
Bumps [lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp) from 0.9.0 to 0.10.0.
- [Release notes](https://github.com/gabrielittner/lazythreetenbp/releases)
- [Changelog](https://github.com/gabrielittner/lazythreetenbp/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gabrielittner/lazythreetenbp/compare/0.9.0...0.10.0)

---
updated-dependencies:
- dependency-name: com.gabrielittner.threetenbp:lazythreetenbp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 13:24:03 +00:00
Onuray Sahin
9a1dbb27d4 Stop proximity sensor while sharing screen. 2022-05-09 13:25:00 +03:00
hanthor
e1960e9593
Merge branch 'vector-im:develop' into develop 2022-05-06 14:57:11 -04:00
Aris Kotsomitopoulos
3c9b5d2ec0
Merge pull request #5927 from vector-im/feature/aris/threads_improve_rendering_issue_5151 
Feature/aris/threads improve rendering issue 5151
 2022-05-06 17:19:01 +03:00
ganfra
b4bc56ff5c Continue cleaning up/adding suspend 2022-05-06 16:12:53 +02:00
Onuray Sahin
cf3d145cd6 Bind to screen sharing service after app killed and relaunched. 2022-05-06 13:21:33 +03:00
Eric Decanini
9f9c6fbc5b
Merge pull request #5953 from vector-im/task/eric/reformat-project 
Reformats project based on editorconfig
 2022-05-06 11:43:54 +02:00
ericdecanini
be0be699e4 Fixes formatting errors in ExportEncryptionTest and VectorBaseActivity 2022-05-06 10:10:25 +02:00
dependabot[bot]
6668814ab6
Bump libphonenumber from 8.12.47 to 8.12.48 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.47 to 8.12.48.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.47...v8.12.48)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-05 23:09:00 +00: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
hanthor
6cd92a5d77
Merge branch 'vector-im:develop' into develop 2022-05-05 12:23:46 -04:00
ClaireG
c9bd1f32b9
Update notifications rules: make a sound for each notification 2022-05-05 14:02:11 +02:00
Onuray Sahin
b486559469 Update video mute status after stopping screen sharing. 2022-05-05 14:15:17 +03:00
Onuray Sahin
754208e164 Don't enable video after stopping screen sharing for audio calls. 2022-05-05 14:02:19 +03:00
Benoit Marty
0b30c28fe4 Opposite if for better code clarity 2022-05-05 12:15:10 +02:00
Benoit Marty
d454e3fd20 Disable chat effect and confetti if animation are disabled on the system 
It will speed up the sanity test
 2022-05-05 12:02:44 +02:00