mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-21 17:05:39 +03:00
Code Issues Projects Releases Packages Wiki Activity
25747 commits 6 branches 120 tags 229 MiB
Commit graph

25747 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Benoit Marty
3ab588fce1 Changelog. 2024-08-26 14:33:54 +02:00
Benoit Marty
fb10bd530d Remove login with QR code feature. 2024-08-26 14:23:07 +02:00
SpiritCroc
ad67b7ea40 Increment version 
Change-Id: I4b87b228bceb3683a32f6ff1c63916c9600ce759
 2024-08-25 09:51:12 +02:00
Benoit Marty
e1ccad5270 Fix Weblate conflict. 2024-08-13 17:41:10 +02:00
Benoit Marty
9c53a09924
Fix wrong PR number in changelog. 2024-08-12 12:48:30 +02:00
SpiritCroc
d2535cdb7e [merge] Suppress lint 
Change-Id: I7310fb496c9c9764cb0f6f62b5f1ef80f78f323d
 2024-08-02 22:03:09 +02:00
SpiritCroc
bffb997511 [merge] Increase gradle jvm heap space for compile again 
Change-Id: I1c1f64a87612cff0fc5896a9f458399a6fbd134b
 2024-08-02 20:10:21 +02:00
SpiritCroc
4d226436b3 Automatic SchildiChat string correction 
Change-Id: I62380028c106d11e5efd4e5c7b522d4167409bed
 2024-08-02 17:59:23 +02:00
SpiritCroc
b79db7b840 Automatic upstream merge postprocessing 
Change-Id: I07058b251c3bc2bcf4a148bf1e1edc9490a8009f
 2024-08-02 17:59:22 +02:00
SpiritCroc
a10220f690 [merge] Fix compile 
Change-Id: I5df927a88f4eb786561a86d8986155ebe71baafd
 2024-08-02 17:57:43 +02:00
SpiritCroc
3291517b8b Merge tag 'v1.6.20' into sc 
Change-Id: Ibf61668b312b1f4b1867ccc6ba4d3174e37550a5

Conflicts:
	library/attachment-viewer/build.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/core/glide/ImageContentRendererDataLoader.kt
	vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
	vector/src/main/java/im/vector/app/core/ui/views/JoinConferenceView.kt
	vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
	vector/src/main/java/im/vector/app/features/crypto/verification/user/VerificationEpoxyExt.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFooterController.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/home/room/threads/list/model/ThreadListItem.kt
	vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
	vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
	vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
	vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
 2024-07-30 20:56:50 +02:00
SpiritCroc
9a381b557e [TMP] Automatic upstream merge preparation 
Change-Id: I57b0f66f0cd19283b23aac5604d44609e13daac6
 2024-07-30 20:31:12 +02:00
SpiritCroc
39cee3aec7 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Idd8a9b535659c2a74f6eddfbfdd37fc3e34e19db
 2024-07-30 20:31:11 +02:00
ganfra
04c3ba9a6a version++ 2024-07-25 11:38:56 +02:00
ganfra
7bdadaa4b5 Merge branch 'release/1.6.20' into develop 2024-07-25 11:37:19 +02:00