mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 01:15:54 +03:00
Code Issues Projects Releases Packages Wiki Activity
25807 commits 6 branches 120 tags 229 MiB
Commit graph

6730 commits

Author SHA1 Message Date
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
dependabot[bot]
751bd27c9d
Bump org.matrix.rustcomponents:crypto-android from 0.3.10 to 0.3.14 
Bumps [org.matrix.rustcomponents:crypto-android](https://github.com/matrix-org/matrix-rust-components-kotlin) from 0.3.10 to 0.3.14.
- [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.3.10...crypto-v0.3.14)

---
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>
 2023-08-25 23:02:56 +00:00
Benoit Marty
0a6dbeb3fe Remove unsupported language. We may handle that during the next SAS string update. 2023-08-23 16:51:31 +02:00
bmarty
e6bd57d88c Sync SAS Strings 2023-08-23 07:21:22 +00:00
Benoit Marty
8f6edba403 Fix typo 2023-08-21 18:00:41 +02:00
SpiritCroc
6b5bfde91e Merge tag 'v1.6.5' into sc 
tag

Change-Id: I4b548719336b58914ac6b52da5a2ea6fac0c4545
 2023-07-26 11:01:57 +02:00
Benoit Marty
9aeb3b7074 version++ 2023-07-25 14:58:22 +02:00
Benoit Marty
8433e222ad Fix unhandled crashes when network is not reacheable. 2023-07-11 18:10:38 +02:00
Yoan Pintas
0573915a0a
Update MSC3912 implementation: Redaction of related events (#8532) 2023-07-04 13:12:37 +00:00
SpiritCroc
1aa3337cba Merge tag 'v1.6.3' into sc 
tag

Change-Id: I59d0cd559bb0aba334dc8662500670d91d00906c

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
 2023-06-27 20:13:46 +02:00
Benoit Marty
2b4b5f05eb
Merge pull request #8556 from vector-im/feature/bma/noJcenter 
Feature/bma/no jcenter
 2023-06-27 17:04:59 +02:00
Valere
7b8cf5d917 version++ 2023-06-27 13:30:17 +02:00
Valere
8cd51ea803 Setting version for the release 1.6.3 2023-06-27 10:04:39 +02:00
valere
3c1c645806 fix sdk ts is already in milliseconds 2023-06-26 11:55:04 +02:00
valere
3e73137c18 Fixes new device detections banner problems 2023-06-26 10:48:58 +02:00
Benoit Marty
ff09ba1208 Import source from https://github.com/cmelchior/realmfieldnameshelper 2023-06-23 17:58:51 +02:00
valere
08ae1105ff Bump rust sdk version to 0.3.10 2023-06-22 16:56:15 +02:00
Yoan Pintas
710d21f6a4
Implement MSC3987: Push actions clean-up (#8530) 2023-06-16 09:13:13 +00:00
valere
6fe0002bd3 Clean room shield update logic 2023-06-12 11:39:55 +02:00
valere
6b2331dcbf Deactivation test broken by latest synapse 2023-06-08 14:18:34 +02:00
SpiritCroc
f440628208 Merge tag 'v1.6.2' into sc 
Change-Id: I7a9ebbae6df28044a8fa308fe34241dbd1d8b8ae

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
 2023-06-05 14:59:06 +02:00
dependabot[bot]
824f3802b2
Bump io.realm:realm-gradle-plugin from 10.15.1 to 10.16.0 (#8499) 
Bumps [io.realm:realm-gradle-plugin](https://github.com/realm/realm-java) from 10.15.1 to 10.16.0.
- [Changelog](https://github.com/realm/realm-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.15.1...v10.16.0)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-06-05 08:27:17 +00:00
Valere
3c08fb637a version++ 2023-06-02 18:05:49 +02:00
valere
ada8539898 Fix remove deprecated isReady() call 2023-06-02 11:28:53 +02:00
valere
be8f226948 bump to 0.3.9 2023-06-02 11:28:53 +02:00
valere
1eda087233 bump crypto sdk to 0.3.8 2023-06-02 11:28:53 +02:00
Hugh Nimmo-Smith
61d4e468cb
Support for stable MSC3882 (#8299) 2023-06-01 18:15:01 +02:00
Valere
2f1a7b76ad
Merge pull request #8485 from vector-im/feature/bca/fix_anrs 
Make cryptoDevice calls suspendable
 2023-06-01 16:36:29 +02:00
Benoit Marty
f741c4e7d9
Merge pull request #8463 from vector-im/dla/feature/always_allow_signout 
Always allow users sign out
 2023-06-01 14:55:39 +02:00
valere
7e6376bf90 remove log 2023-05-31 15:14:28 +02:00
valere
b59068b463 missing suspend 2023-05-31 09:52:43 +02:00
valere
268cbb83cd Make cryptoDevice calls suspendable 2023-05-30 23:47:50 +02:00
Valere
83795344ed
Merge pull request #8470 from vector-im/feature/bca/extract_common_crypto 
Extract common crypto interface for all flavors
 2023-05-30 09:09:30 +02:00
valere
b37eca4520 fix rust crypto still need CryptoMetadataEntity for global pref 2023-05-26 18:22:47 +02:00
Alex Maras
24b18847b5
Fix animated webp playback (#8120) 
* fix: add webp as playable image type

* fix: make glide transformations optional to prevent rendering webp throwing exception

* fix: stop marking webp as playable by default

* fix: play animated Webp in attachment view

* feat: autoplay webp if autoplay is enabled

---------

Signed-off-by: Alex Maras <dev@alexmaras.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
 2023-05-26 17:03:24 +02:00
valere
ac916078bc fix test compilation 2023-05-26 16:04:25 +02:00
valere
3bf5c0cc1b Extract common crypto interface for all flavors 2023-05-26 09:50:15 +02:00
SpiritCroc
9614f5994d Merge tag 'v1.6.1' into sc 
Change-Id: If1da0c145abfecd01df1384bedc794d2dd4d6bef

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
 2023-05-25 12:03:56 +02:00
Benoit Marty
8f69e411d7 version++ 2023-05-25 11:22:07 +02:00
Benoit Marty
82748591f9 Setting version for the release 1.6.1 2023-05-25 11:05:07 +02:00
Benoit Marty
997c9dd917 Ensure signout service is always use even if users want to ignore sigout error from the server. The SDK is doing more cleanup. 2023-05-25 10:38:08 +02:00
Valere
e4e4c2940b
Merge pull request #8441 from vector-im/feature/bca/more_migration_logs 
Add more migration logs
 2023-05-24 10:11:08 +02:00
Valere
591b08f1ff
Merge pull request #8461 from vector-im/feature/bca/fix_several_anr 
Fix several app non responsive issues
 2023-05-23 18:32:13 +02:00
valere
2ea6cdba6f Fix app non responsive 2023-05-23 08:30:58 +02:00
valere
705b17e7f1 fix always returning live devices for current user 2023-05-22 19:26:05 +02:00
SpiritCroc
d9c1ec588d Merge tag 'v1.6.0' into sc 
v1.6.0

Change-Id: Iaca4b437bc5a267c40b83a87a98eb7761dae345b

Conflicts:
	library/ui-styles/src/main/res/values/styles_app_bar_layout.xml
	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/crypto/verification/emoji/VerificationEmojiCodeController.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
	vector/src/main/res/layout/dialog_disclaimer_content.xml
	vector/src/main/res/xml/vector_settings_help_about.xml
 2023-05-22 14:19:46 +02:00
Benoit Marty
66aa4226b5 version++ 2023-05-17 14:55:30 +02:00
valere
6e27ffc3cf Add more migration logs 2023-05-17 12:41:11 +02:00
Benoit Marty
134992cf0d Setting version for the release 1.6.0 2023-05-17 12:10:23 +02:00
Valere
215c503a79
Merge pull request #8419 from vector-im/feature/bca/fix_qr_verif_refresh 
Fix 8418
 2023-05-11 14:52:47 +02:00
Benoit Marty
e2b20f0d91 Fix compilation issue 2023-05-11 11:45:34 +02:00
valere
1a1f6810e2 Fix missing implem 2023-05-11 10:48:28 +02:00
valere
7d9330b2ee Ensure keys & signature after rust migration 2023-05-11 10:48:10 +02:00
valere
8d58799134 Fix 8418 2023-05-10 14:28:56 +02:00
valere
e254f1e7da Ignore a test for flackyness 2023-05-09 22:08:56 +02:00
valere
a170c0b7db test legacy is partially cleaned 2023-05-09 22:08:56 +02:00
valere
98841bbe3d post rebase fix 2023-05-09 22:08:56 +02:00
valere
49054d8a15 Fix migration test per source set 2023-05-09 22:08:56 +02:00
valere
03905910e2 fix changelog 2023-05-09 22:08:56 +02:00
valere
fd186c1f32 create rust db as a realm migration 2023-05-09 22:08:56 +02:00
Benoit Marty
622aa88f86 Remove LegacySessionImporter, and the dialog which explains that Riot is now Element. 2023-05-05 16:04:30 +02:00
dependabot[bot]
df54e3e833
Bump com.squareup.okhttp3:okhttp-bom from 4.10.0 to 4.11.0 
Bumps [com.squareup.okhttp3:okhttp-bom](https://github.com/square/okhttp) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.10.0...parent-4.11.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-05 09:08:44 +00:00
Valere
e7c122ef1d
Merge pull request #8366 from vector-im/feature/bca/rust_integration_test_wf 
add workflow for rust test
 2023-05-05 10:53:47 +02:00
Benoit Marty
1204d79189
Merge pull request #8347 from vector-im/dependabot/gradle/net.java.dev.jna-jna-5.13.0 
Bump net.java.dev.jna:jna from 5.10.0 to 5.13.0
 2023-05-05 10:45:46 +02:00
valere
f9ae582141 add changelog 2023-05-04 14:47:19 +02:00
Benoit Marty
613dc3d7fa Fix crash when starting app with no available network. 2023-05-04 12:02:09 +02:00
valere
a744ad1f60 update rust migration to support lazy 2023-05-04 12:00:53 +02:00
valere
1a8581a78e Update rust sdk to fix withheld test 2023-05-04 10:36:39 +02:00
Valere
92c37f3bb2
Merge pull request #8364 from vector-im/feature/bca/expose_rust_crate_version 
Expose rust version in settings and RS
 2023-05-03 12:50:37 +02:00
valere
90980a415e Fix test using all signatures 2023-05-03 12:49:03 +02:00
dependabot[bot]
343837ff14
Bump io.realm:realm-gradle-plugin from 10.11.1 to 10.15.1 (#8349) 2023-05-03 08:27:04 +00:00
valere
85b9dda092 Missing backup signature 
Ensure device keys before bootstrap cross signing
 2023-04-28 18:58:38 +02:00
SpiritCroc
eeb4b8dc0d Switch to height 32 for sent custom emotes, as suggested by MSC2545 
Change-Id: If59aed6fe9b6af1acfe69db0a89d073558279882
 2023-04-27 10:48:13 +02:00
valere
3705e14851 Expose rust version in settings and RS 2023-04-25 13:31:15 +02:00
Valere
46a49d899c
Merge pull request #8354 from vector-im/feature/bca/upgrade_crypto_crate 
bump rust crypto to 0.3.5 (withheld)
 2023-04-24 17:53:43 +02:00
valere
7c3751f568 bump rust crypto to 0.3.5 (withheld) 2023-04-21 18:09:13 +02:00
valere
b0149c4960 Changelog + doc update 2023-04-21 10:15:03 +02:00
valere
178875b809 fix rust isCrossSigningVerified 2023-04-21 10:09:19 +02:00
dependabot[bot]
efd9a086b1
Bump net.java.dev.jna:jna from 5.10.0 to 5.13.0 
Bumps [net.java.dev.jna:jna](https://github.com/java-native-access/jna) from 5.10.0 to 5.13.0.
- [Release notes](https://github.com/java-native-access/jna/releases)
- [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md)
- [Commits](https://github.com/java-native-access/jna/compare/5.10.0...5.13.0)

---
updated-dependencies:
- dependency-name: net.java.dev.jna:jna
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-20 23:56:59 +00:00
SpiritCroc
acdf419768 Merge tag 'v1.5.32' into sc 
Note: mainly conflicts in differing implementations to fix duplicate
read receipts.

After a quick glance at the upstream implementation, my first impression
is that we likely want to keep our downstream implementation:
- Better performance by checking for the more recent receipt in the SDK
  upon receipt receival, instead on rendering the timeline
- null seems to always map to main, which caused us jumping receipts in
  the past, which we have addressed by now

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.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/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt

Change-Id: I47ae2afe5fcbe77a4fec69374d83821b94a431de
 2023-04-20 10:53:09 +02:00
valere
8e6db1714b Clean and update doc 2023-04-20 09:53:48 +02:00
valere
b2c7f05a10 Merge branch 'develop' into feature/bca/rust_flavor 2023-04-20 09:51:17 +02:00
ganfra
83296727a2 version++ 2023-04-19 16:26:20 +02:00
valere
4d9596b56e do not launch in constructor 2023-04-14 16:48:24 +02:00
valere
ca8dc37012 fix scope usage 2023-04-14 15:45:33 +02:00
valere
0e503503d2 Merge branch 'develop' into feature/bca/rust_flavor 2023-04-13 15:49:20 +02:00
Yoan Pintas
110b5cfcb4
Add pills for permalink supported hosts (#8324) 2023-04-12 12:35:01 +00:00
valere
70508544cd fix warning equals but no hashcode 2023-04-07 14:09:56 +02:00
valere
1b12db9270 Test framework cleaning 2023-04-07 11:34:27 +02:00
valere
89267256ef Fix use if internal API 2023-04-06 16:55:45 +02:00
valere
e554ecc030 fix flackiness source 2023-04-06 13:39:38 +02:00
valere
ee1580c50e Fix failing test 2023-04-06 09:59:00 +02:00
valere
2077d972bc Fix test deadlock with await latch 2023-04-06 09:58:45 +02:00
valere
3e1b59d062 Merge branch 'develop' into feature/bca/rust_flavor 2023-04-06 08:53:20 +02:00
valere
17c41fca88 async backup throws now 2023-04-05 19:27:56 +02:00
valere
1b57770955 put back retry rule, flackiness 2023-04-05 17:58:56 +02:00
valere
a5a95995e1 test flakiness 2023-04-05 16:37:36 +02:00
valere
d023d9df7d fix sas test 2023-04-05 15:12:59 +02:00
ganfra
fe69d8e3fa Fix multiple read receipts for the same user in timeline #7882 2023-04-05 13:08:12 +02:00
valere
b45b90dcdf Fix verification bottomsheet not updating 2023-04-05 12:12:40 +02:00
SpiritCroc
965ba93de4 Merge tag 'v1.5.30' into sc 
Version 1.5.30

Change-Id: I732e9fe05182e53968eab1d03f99dabdc148fed9

Conflicts:
	dependencies.gradle
	dependencies_groups.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
	vector/src/main/res/drawable/ic_composer_rich_text_save.xml
 2023-04-05 11:28:26 +02:00
Jorge Martín
c6e612c058 version++ 2023-04-05 10:18:30 +02:00
valere
b704b64255 Fix backup tests 2023-04-05 09:15:07 +02:00
SpiritCroc
76d1c81495 [TEST] Restructure RR deduplication logic and avoid threads 
We probably should add an extra check to only set main_or_null to events
which actually exist in the main thread

Change-Id: I8db0010e8717b6941917225fcce6646685814665
 2023-04-02 13:02:50 +02:00
SpiritCroc
5ef2341bec [TEST] Fix another case of wrong read receipt location, to be observed 
Context: https://github.com/SchildiChat/SchildiChat-android-rageshakes/issues/995

So comparing timestamps for main vs null read receipts does not seem to
work at all... so better only use that as fallback in case we really
don't know which event came later...?

Change-Id: I8f7df95735d1478784ec5f8bf3b0b1a70c534a29
 2023-04-02 12:38:25 +02:00
SpiritCroc
f4e9559eca In threads, reply fallback shouldn't cause stickers to render as bubble 
Change-Id: I9539c77520e2d1563c3e782d649c2868e08ad81a
 2023-04-01 16:23:45 +02:00
SpiritCroc
5f787db4f1 Send-as-sticker button for sticker-enabled custom emotes 
Add some primitive support for sending MSC2545 stickers, at least for
stickers that also support sending as custom emote.
Also, this introduces support to sending stickers as reply this way 🎉

Change-Id: I85b245c2c40b9662342459e50285c081d37f324b
 2023-04-01 16:15:22 +02:00
valere
aab1afc352 ignore deprecated test 2023-03-31 18:26:40 +02:00
valere
84369005ba Fix E2eeShareKeysHistoryTest 2023-03-31 16:09:36 +02:00
valere
0cdd0a7521 Fix testCantDecryptIfGlobalUnverified 2023-03-31 10:17:44 +02:00
valere
507cd98304 Fix E2EShareConfigTest 2023-03-31 09:33:22 +02:00
valere
69b7efdfa1 disable outdated no_olm test 2023-03-30 17:45:56 +02:00
Yoan Pintas
ed121c051b
Add user completion for matrix ids (#8271) 2023-03-30 08:04:59 +00:00
valere
8f1bbd6ff0 revert as kotlin crypto specific test 2023-03-29 10:00:08 +02:00
valere
bcc1ac4ac9 rust-crypto 0.3.1 , wa to fix compilation 2023-03-28 23:33:23 +02:00
valere
927f7757cd Merge branch 'develop' into feature/bca/rust_flavor 2023-03-28 17:17:35 +02:00
SpiritCroc
1004bd19e3 [TEST] Don't set main_or_null read receipt to old events 
Context:
https://github.com/SchildiChat/SchildiChat-android-rageshakes/issues/951

If main RR updates after null RR, but to an older event than the null
RR, we still want to keep the null one.

Change-Id: Ib865965b6975536421b15146c863b9ea46f793b0
 2023-03-25 08:32:22 +01:00
Yoan Pintas
9fd1a22e10
Pillify permalinks (#8242) 2023-03-21 21:31:45 +00:00
valere
540943383e use maven deployed rust sdk 2023-03-16 10:18:37 +01:00
valere
065ee1d2f5 cleaning 2023-03-14 12:07:39 +01:00
valere
5f069264d0 Ignore some test in tust. Added some supports flags 2023-03-14 09:57:58 +01:00
valere
238d10d4cb Test integration of rust shield states 2023-03-10 10:30:37 +01:00
valere
5f185c51e7 Merge branch 'develop' into feature/bca/rust_flavor 2023-03-09 18:21:41 +01:00
SpiritCroc
80edce3d6c Escape @room in reply fallback to avoid unintentional pings 
Closes https://github.com/SchildiChat/SchildiChat-android/issues/178

Change-Id: I8a545dd80d29802d1b35b0315fca89125c997f15
 2023-03-09 10:54:03 +01:00
SpiritCroc
19881a9f70 Merge tag 'v1.5.28' into sc 
Change-Id: Ic5e1c79d3c39476375bf795bb7a1abb67c664f94

Conflicts:
	dependencies.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
	vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml
 2023-03-08 20:27:57 +01:00