mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 17:40:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
25813 commits 7 branches 124 tags 230 MiB
Commit graph

25813 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
21e751e50f
Merge pull request #8903 from element-hq/sync-emojis 
Sync Emojis
 2024-09-25 15:35:43 +02:00
Benoit Marty
b50132a337
Merge pull request #8915 from element-hq/feature/bma/agpl 
Change license to AGPL
 2024-09-25 14:51:06 +02:00
Benoit Marty
dd98218869
Merge pull request #8913 from bro2020/patch-mobile.element.io 
Intercept mobile.element.io links with Element app
 2024-09-25 11:30:04 +02:00
SpiritCroc
e48fdcae8e Merge remote-tracking branch 'ratatoskr-org/sc' into sc 
Change-Id: Ic2a0c968c1ab484fbf3fbd9effabf5a94fa1032d
 2024-09-24 20:14:26 +02:00
SpiritCroc
eb9922f4bc Align color matrix preference style with other preferences 
Change-Id: I1748b2052b7f82f417183f657aa6381d4c6dbbdd
 2024-09-24 20:09:01 +02:00
SpiritCroc
a5fa01d5bf Add logs to debug next time notification request thrashes 
Change-Id: I3613db1c5495549a0ea92ec96967b5c408c6aadb
 2024-09-24 20:03:33 +02:00
SpiritCroc
2f5aff8fa5 Automatic SchildiChat string correction 
Change-Id: Ie605b56f394b069429dede5026b2ee2b7509ef2b
 2024-09-24 18:54:08 +02:00
SpiritCroc
47f507ff8c Automatic upstream merge postprocessing 
Change-Id: I424200e98b40593000e0949ff644dfdad513fd70
 2024-09-24 18:54:07 +02:00
SpiritCroc
3f6c2d60ad Merge tag 'v1.6.22' into sc 
tag

Change-Id: I639c817f96e79b891af3052032caf6e6464c23aa
 2024-09-24 18:53:46 +02:00
SpiritCroc
0b48fdb79f [TMP] Automatic upstream merge preparation 
Change-Id: Idb49d11942593484e7d8bf334c7ac8095e6dc54c
 2024-09-24 18:53:42 +02:00
SpiritCroc
15f63be87e Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ic24e497c41abd6c045827b281db7e870e430333f
 2024-09-24 18:53:41 +02:00
Benoit Marty
ba9d78e0d2 Update licence header. 
Other files.
 2024-09-24 12:09:02 +02:00
Benoit Marty
5c333aeafc Update licence header. 
Using `uv run license-editor --repository ../element-android`
 2024-09-24 12:02:33 +02:00
Benoit Marty
c24014e596 AGPL licence 2024-09-24 11:51:53 +02:00
Benoit Marty
08decf47c6 Fix version which migrate the session to the crypto Rust SDK in the release note. 2024-09-24 07:29:32 +02:00
Benoit Marty
52d06bd7cf Revert "Setting version for the release 1.6.22" 
This reverts commit c947f90adb.
 2024-09-23 20:51:18 +02:00
Benoit Marty
c947f90adb Setting version for the release 1.6.22 2024-09-23 20:46:17 +02:00
Benoit Marty
9ca1ffdea0 version++ 2024-09-23 19:38:56 +02:00
Benoit Marty
a568152490 Merge tag 'v1.6.22' into develop 
tag
 2024-09-23 19:38:14 +02:00
Benoit Marty
9a4602bfd4 Merge branch 'release/1.6.22' into main 2024-09-23 19:38:02 +02:00
Benoit Marty
cfedc00c38 Adding fastlane file for version 1.6.22 2024-09-23 19:37:55 +02:00
Benoit Marty
af2cefebce Changelog for version 1.6.22 2024-09-23 19:37:25 +02:00
Benoit Marty
ac01523066
Merge pull request #8901 from element-hq/feature/bma/removeLibolm 
Remove dependency on libolm
 2024-09-23 19:26:09 +02:00
Benoit Marty
1ac5090581
Merge pull request #8905 from Erquint/patch-1 
Update strings.xml to fix the "see and managed addresses[…]" typo.
 2024-09-23 16:59:25 +02:00
Benoit Marty
e89bec4f27 use pkEncryption, to properly close it. 2024-09-23 16:05:44 +02:00
bmarty
76898f083c Sync Emojis 2024-09-23 00:12:20 +00:00
Benoit Marty
f7195a878a Fix copyright issue. 2024-09-20 12:46:02 +02:00
dependabot[bot]
9efb692e32 Bump org.matrix.rustcomponents:crypto-android from 0.4.1 to 0.4.3 
Bumps [org.matrix.rustcomponents:crypto-android](https://github.com/matrix-org/matrix-rust-components-kotlin) from 0.4.1 to 0.4.3.
- [Release notes](https://github.com/matrix-org/matrix-rust-components-kotlin/releases)
- [Commits](https://github.com/matrix-org/matrix-rust-components-kotlin/compare/crypto-v0.4.1...crypto-v0.4.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-20 10:17:50 +02:00
Benoit Marty
04a49e9195
Merge pull request #8911 from element-hq/feature/bma/jitsi-10.2.0 
Upgrade Jitsi to 10.2.0
 2024-09-19 10:02:15 +02:00
bro2020
0f14a2847d
Create 8904.bugfix 2024-09-19 02:53:14 +03:00
bro2020
036d6c3783
Fix it https://github.com/element-hq/element-android/issues/8904 2024-09-19 02:33:12 +03:00
Benoit Marty
da94bb8ffa Fix typo in script name. 2024-09-18 16:54:43 +02:00
Benoit Marty
4aab1ad8f7 Use Jitsi SDK 10.2.0 2024-09-18 16:53:24 +02:00
Murad "Gness Erquint" Beybalaev
2ed0b4f95b
Update strings.xml 
"See and managed addresses" typo fixed.
 2024-09-17 00:12:45 +03:00
Benoit Marty
f726d16ce0 Fix wrong sha256 conversion and add unit test. 2024-09-16 17:45:43 +02:00
Benoit Marty
51c20b4572 Fix quality issues. 2024-09-12 21:14:19 +02:00
Benoit Marty
9dcb7c890f Use local val and more compact code. 2024-09-12 21:06:05 +02:00
Benoit Marty
14a52d4a05 ScanEncryptorUtils.getDownloadBodyAndEncryptIfNeeded can throw, ensure it will not crash the application. 2024-09-12 21:05:16 +02:00
Benoit Marty
8056285776 New SDK: fix API break. 2024-09-11 12:18:02 +02:00
Benoit Marty
355621b0c7 Encrypt data for the content scanner using PkEncryption from the Rust SDK. 2024-09-11 11:48:10 +02:00
Benoit Marty
fc68f1cb66 Remove todo and cleanup 2024-09-11 11:23:01 +02:00
Benoit Marty
637a2271ef Remove old unused algorithm m.secret_storage.v1.curve25519-aes-sha2 
https://github.com/uhoreg/matrix-doc/blob/symmetric_ssss/proposals/2472-symmetric-ssss.md
"The m.secret_storage.v1.curve25519-aes-sha2 method proposed in MSC1946 is removed."
 2024-09-11 11:23:01 +02:00
Benoit Marty
15c86f3fe3 Better cleanup of the Crypto database. 2024-09-11 11:23:00 +02:00
Benoit Marty
5908cd54f0 Remove dependency on libolm - WIP 2024-09-11 11:23:00 +02:00
Benoit Marty
6a8e978204
Merge pull request #8900 from element-hq/feature/bma/testScanEncryptorUtils 
Add unit test on ScanEncryptorUtils.
 2024-09-11 11:13:10 +02:00
Benoit Marty
9585262a53 Add test when a server public key is provided. 2024-09-10 15:35:08 +02:00
Benoit Marty
797a4f93b2 Add unit test on ScanEncryptorUtils. 2024-09-10 14:56:10 +02:00
Benoit Marty
76616b1a28
Merge pull request #8890 from element-hq/feature/bma/removeLegacyQrCodeLogin 
Remove legacy qr code login
 2024-08-27 09:36:14 +02:00
Benoit Marty
91d96681eb More cleanup 2024-08-26 16:06:47 +02:00
Benoit Marty
0baf670fea Fix layout issue. 2024-08-26 14:44:23 +02:00