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

6654 Commits

Author SHA1 Message Date
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
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
Giom Foret 57d224e8ba fix Unexpected newlines 2023-10-13 16:39:05 +02:00
Giom Foret d26d28f770 Merge branch 'feature/bma/noNetworkConstraint' of github.com:vector-im/element-android into feature/bma/noNetworkConstraint 2023-10-13 15:36:14 +02:00
Giom Foret 3aa5f34ee7 Update the NetworkConstraint handling in WorkManager config 2023-10-13 15:32:47 +02:00
Benoit Marty 8d95eb7b16 `disableNetworkConstraint` is now nullable, so do not default the Boolean to false. 2023-10-13 15:13:48 +02:00
Benoit Marty 64a7de5326 Ensure Boolean `io.element.disable_network_constraint` is explicitly set in the .well-known file. 2023-10-13 09:37:58 +02:00
Benoit Marty 7884b9dd5e Cleanup 2023-10-13 09:26:36 +02:00
Benoit Marty d4c6a46e90 Parse "io.element.disable_network_constraint" from login response, to ensure that the config is retrieved. 
The add pusher worker can be configured before the .well-known config is retrieved.
 2023-10-12 18:13:54 +02:00
Valere 77a576784f fix test compilation 2023-10-11 23:08:35 +02:00
Valere 491f52a3a3 dead code 2023-10-11 17:57:59 +02:00
Valere e27916f85e detekt fix 2023-10-10 16:25:03 +02:00
Giom Foret 973246819a Fix Task :matrix-sdk-android:compileKotlinCryptoDebugUnitTestKotlin FAILED 
e: file:///home/runner/actions-runner/_work/element-android/element-android/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersServiceTest.kt:55:5 No value passed for parameter 'homeServerCapabilitiesDataSource'
 2023-10-10 14:11:38 +02:00
Valere 25ecd599f3 Merge branch 'develop' into feature/bca/clean_up_legacy_crypto 2023-10-10 13:00:45 +02:00
Benoit Marty f13a15495b Add a log when network constraint is disabled. 2023-10-09 12:04:35 +02:00
Benoit Marty 2a5e233e2c Do not apply network constraint if "io.element.disable_network_constraint" is set to true in .well-known file. 2023-10-09 11:44:40 +02:00
Benoit Marty 842aeb70e0 Parse "io.element.disable_network_constraint" from .well-known file. 
Migrate DB to 54.
 2023-10-06 18:03:45 +02:00
SpiritCroc 1892cf0ff8 Merge tag 'v1.6.6' into sc 
Change-Id: I785561f0b2283214dd419a6c7028e374b85dc598

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
 2023-10-05 17:23:23 +02:00
ganfra ecd1057ce9 version++ 2023-10-05 17:00:51 +02:00
Valere a015eda72c code review 2023-10-03 11:29:50 +02:00
Valere 87df8ab6f6
Update matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/SecretShareManager.kt 
Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2023-10-03 11:24:38 +02:00
Valere 1bd2da5c99 disable flacky test on legacy crypto 2023-10-02 16:39:08 +02:00
Valere a6b127cb20 code quality 2023-10-02 15:31:11 +02:00
Valere df82eee736 Code quality kdocs 2023-10-02 14:37:15 +02:00
Valere dfbb3122e7 Remove legacy crypto code 2023-10-02 13:58:51 +02:00
Valere 6ee438d7d5 bump crypto sdk 2023-10-01 19:25:12 +02:00
Valere 3b9daec869 Fix QR code login support in rust 2023-09-27 15:42:05 +02:00
Benoit Marty ec9a066900
Merge pull request #8620 from vector-im/feature/bma/oidcSessionEnd 
Feature/bma/OIDC session end
 2023-09-12 16:25:46 +02:00
Benoit Marty 52a06931f4 Change the test to hide multi signout of devices. 
We do not need an external account management URL, which is optional, but we need to know if account management is delegate to Oidc.
 2023-08-31 16:04:45 +02:00
Benoit Marty a889d8d678 Store the authentication issuer into DB. 2023-08-31 09:57:47 +02:00