filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,667 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

6682 Commits

Author SHA1 Message Date
SpiritCroc 21eec091f8 Merge tag 'v1.6.18' into sc 
Change-Id: Ifc8466ddf92154fb9be05b372f234ffe26da47ba

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
 2024-06-29 10:28:16 +02:00
Jorge Martín f8345ab9ef When sending user mentions, always send the user id as the fallback text 2024-06-19 16:56:47 +02:00
Valere ad9f9fb193 Accept and pass any deviceKey payload to rust 2024-06-12 09:32:27 +02:00
Valere 4aaf22832f Fix | Share room keys with dehydrated devices 2024-06-12 09:32:27 +02:00
Valere 47bb23a654
Merge pull request #8839 from element-hq/feature/bca/add_platformcode_to_posthog 
Support reporting super properties to posthog (appPlatform)
 2024-05-31 14:05:56 +02:00
SpiritCroc abdc558c07 Merge tag 'v1.6.16' into sc 
Change-Id: I690d21f0bac84dfed5d6f87e9c1aa30c78c8d346

Conflicts:
	dependencies_groups.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
 2024-05-30 20:16:19 +02:00
Benoit Marty 7e41d731f6 Move getCryptoVersion from CryptoService to Matrix companion, it does not need a session to get the value. 
This simplify a lot accessing this data.
 2024-05-30 13:10:36 +02:00
Valere 09c68f3421 Remove unused context in crypto service getCryptoVersion 2024-05-29 17:38:36 +02:00
ganfra 72575a2493 version++ 2024-05-29 12:07:55 +02:00
Valere 5ac70dac2b Bump rust sdk crypto to 0.4.1 2024-05-27 09:48:30 +02:00
Benoit Marty 085bf8230e
Merge pull request #8817 from element-hq/hughns/qr-mscs-closed 
Add note about MSC3886, MSC3903 and MSC3906 being closed
 2024-05-16 14:32:38 +02:00
Benoit Marty 2362fcde16
TODO must not be followed by `:` 2024-05-16 14:02:15 +02:00
Hugh Nimmo-Smith a8a9c61a69 Add note about MSC3886, MSC3903 and MSC3906 being closed 2024-05-03 13:16:31 +01:00
yostyle 33d09ecf40 fix: update local file access permission 2024-04-18 16:29:02 +02:00
SpiritCroc 38b0b246e2 Merge tag 'v1.6.14' into sc 
tag

Change-Id: I87dca48559687c9210fec8bebb031305d8d5578c
 2024-04-02 19:51:29 +02:00
Benoit Marty c2b46a1c1e version++ 2024-04-02 18:16:38 +02:00
Valere 72d2199f1a refactor: StreamEventsManager report MXCryptoError instead of throwable 2024-03-27 09:53:13 +01:00
Valere 3fa3eb1129 fix rust device to CryptoDeviceInfo mapping 2024-03-27 09:53:13 +01:00
Valere ee59171491 Fix StreamEventsManager not signaling event decryptions 2024-03-12 09:00:50 +01:00
SpiritCroc 4b3b454068 Merge tag 'v1.6.12' into sc 
tag

Change-Id: Iecfd29cb1d95af84fa2c8433c45e69c6ffa20a57
 2024-02-20 15:01:32 +01:00
Benoit Marty 8682a75b0a version++ 2024-02-16 11:57:54 +01:00
Benoit Marty 6ea0129bee Location sharing: use Room member avatar instead of profile avatar. 2024-02-02 18:36:29 +01:00
Benoit Marty c6bb054fd7 Add a log when User is not kwown. 2024-02-02 17:25:00 +01:00
Benoit Marty 7dc8c436cf Fix test. `getClearContent()` return the decrypted content for encrypted Event, and it is null in this case 2024-02-01 18:43:59 +01:00
Benoit Marty ec96f4e0ae Fix assignment issue. `sessionId` was used instead of `roomId`. 
This may fix issue of Event not decrypted if the key is coming late for the last Event displayed in the Room list.
 2024-02-01 18:11:44 +01:00
Benoit Marty e04bfe8981 Remove dead code 2024-02-01 18:02:04 +01:00
Benoit Marty a1140fd8fa Improve getClearContent() method: it should not fallback to the encrypted content when the content is not decrypted. 2024-02-01 17:28:29 +01:00
SpiritCroc 4573a4235e Merge tag 'v1.6.10' into sc 
Change-Id: If32b84a60de38eab046bbedeb2b1e8d9c6094bb3

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
	vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt
 2024-01-10 19:57:20 +01:00
Benoit Marty ee16ef06e9 version++ 2024-01-09 12:20:07 +01:00
ganfra 2ada4c8491 Fix quality 2024-01-02 08:17:26 +01:00
ganfra 320aae1430 Also fix pills with rich text editor 2024-01-02 08:17:26 +01:00
ganfra b72039e735 Fix a bunch of issues related to edition and reply #5969 2024-01-02 08:17:26 +01:00
Benoit Marty e818f86896
Merge pull request #8666 from yostyle/yostyle/fix_crypto_migration 
Move crypto migration
 2023-12-21 09:33:17 +01:00
yostyle 18ccc25575 fix lint 2023-12-15 12:25:29 +01:00
Yoan Pintas 7f8e73ee4d
Merge branch 'element-hq:develop' into yostyle/fix_crypto_migration 2023-12-15 10:36:32 +00:00
Benoit Marty 6d65a74f1d Organization renaming: replace all `https://github.com/vector-im` by `https://github.com/element-hq` 2023-12-13 11:01:40 +01:00
bmarty 9c6fbcd141 Sync SAS Strings 2023-12-11 00:03:20 +00:00
Benoit Marty 8e0c503b45 Support Functional members #3736 2023-12-04 09:16:26 +01:00
SpiritCroc b2c8548e29 Merge tag 'v1.6.8' into sc 
tag

Change-Id: I0a2384fc2e4eda861a191b0b8c85641916854ac8

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
	matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/build.gradle
	vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
 2023-11-28 20:04:00 +01:00
Benoit Marty bb9d1fc8d8 version++ 2023-11-28 17:23:40 +01:00
yostyle 7755da881e Move crypto migration 2023-11-16 16:29:26 +01:00
Valere 1a941149ab
Merge pull request #8679 from vector-im/feature/bca/bump_crypto_sdk_version 
bump crypto sdk to 0.3.16
 2023-11-14 22:26:32 +01:00
yostyle 3179dc1400 Update regex for email address 2023-11-14 12:38:10 +01:00
Valere d3391076b5 fix comment 2023-11-14 12:09:05 +01:00
Valere f37d918ce6 fix outdated documentation 2023-11-14 11:24:05 +01:00
Valere b61b2b6f16 bump crypto sdk to 0.3.16 2023-11-13 22:23:11 +01:00
Valere 4e53d8462f use error instead of require 2023-11-10 16:33:46 +01:00
Benoit Marty 454ba7bf7c
Merge branch 'develop' into feature/bca/clean_up_legacy_crypto 2023-11-07 14:13:56 +01:00
Benoit Marty 17e9bd200b Use Matrix.org copyright. 2023-10-13 22:02:52 +02:00
Benoit Marty fd07835e45 Fix IDE warning 2023-10-13 22:01:46 +02:00