Commit Graph

6696 Commits

Author SHA1 Message Date
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
ganfra 95e1bcbf64
Merge pull request #8868 from element-hq/feature/fga/authenticated_media
Feature/fga/authenticated media
2024-07-19 16:30:40 +02:00
ganfra 59f3c6e8da Fix copyrights. 2024-07-19 14:08:23 +02:00
ganfra 497f422b2b Authenticated media : fix pr remarks 2024-07-19 12:56:58 +02:00
Benoit Marty 669a80e8e4 Update Realm gradle plugin and Flipper dependencies. 2024-07-19 12:36:02 +02:00
ganfra d10e83bb48 Authenticated media : fix formatting. 2024-07-19 10:25:45 +02:00
ganfra fa0860ac0f Authenticated media : listen db. 2024-07-18 17:52:53 +02:00
Benoit Marty 1e32ebde41 Use ContextCompat.registerReceiver with explicit RECEIVER_EXPORTED to fix crash on API 34.
java.lang.SecurityException: im.vector.app.debug: One of RECEIVER_EXPORTED or RECEIVER_NOT_EXPORTED should be specified when a receiver isn't being registered exclusively for system broadcasts
2024-07-18 17:15:06 +02:00
ganfra 9e27705b6e Merge branch 'develop' into feature/fga/authenticated_media 2024-07-18 15:56:48 +02:00
Benoit Marty b3bd361a08 Add Realm migrations due to upgrade of Kotlin version.
See https://github.com/realm/realm-java/issues/7810 for more details.
2024-07-16 15:03:55 +02:00
Benoit Marty 19500a8cd9 Upgrade a few dependencies and update the codebase
Use fully qualified R classes
Fix or ignore deprecation
Update github actions and ensure JDK 17 is used
Add group for paparazzi
Fixes Lint issues
Fix Jacoco configuration
2024-07-15 18:12:20 +02:00
ganfra da8c892f7a Authenticated media : makes usage of API when server supports it 2024-07-10 16:53:10 +02:00
ganfra 7ad3ccfc60 Authenticated media : add versions check to HomeServerCapabilities 2024-07-05 17:58:25 +02:00
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
Benoit Marty 207ab2802a version++ 2024-06-25 15:14:20 +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