Commit Graph

6558 Commits

Author SHA1 Message Date
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 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