Commit Graph

14764 Commits

Author SHA1 Message Date
SpiritCroc e48fdcae8e Merge remote-tracking branch 'ratatoskr-org/sc' into sc
Change-Id: Ic2a0c968c1ab484fbf3fbd9effabf5a94fa1032d
2024-09-24 20:14:26 +02:00
SpiritCroc eb9922f4bc Align color matrix preference style with other preferences
Change-Id: I1748b2052b7f82f417183f657aa6381d4c6dbbdd
2024-09-24 20:09:01 +02:00
SpiritCroc a5fa01d5bf Add logs to debug next time notification request thrashes
Change-Id: I3613db1c5495549a0ea92ec96967b5c408c6aadb
2024-09-24 20:03:33 +02:00
SpiritCroc 3f6c2d60ad Merge tag 'v1.6.22' into sc
tag

Change-Id: I639c817f96e79b891af3052032caf6e6464c23aa
2024-09-24 18:53:46 +02:00
Benoit Marty 4aab1ad8f7 Use Jitsi SDK 10.2.0 2024-09-18 16:53:24 +02:00
Benoit Marty 91d96681eb More cleanup 2024-08-26 16:06:47 +02:00
Benoit Marty 0baf670fea Fix layout issue. 2024-08-26 14:44:23 +02:00
Benoit Marty fb10bd530d Remove login with QR code feature. 2024-08-26 14:23:07 +02:00
五河 琴里 ee84015e1d
Add keyboard only navigation support to fragment_login_server_selection fragment 2024-08-10 18:50:54 +09:00
SpiritCroc a10220f690 [merge] Fix compile
Change-Id: I5df927a88f4eb786561a86d8986155ebe71baafd
2024-08-02 17:57:43 +02:00
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 d10e83bb48 Authenticated media : fix formatting. 2024-07-19 10:25:45 +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 5203dd86b4 Add packaging pickFirst to fix tests. 2024-07-16 13:14:41 +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
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 a1dd3ba1b5 Replace `*.element.io` deep link with actual hosts
This is done to avoid incorrectly intercepting links in other apps, as Element X Android.
2024-06-25 11:48: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
ganfra 2158aa0913 Fix redacted events not grouped correctly when hidden events are inserted between #8840 2024-05-31 16:13: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 28fa4ab784 improve tests 2024-05-29 17:49:02 +02:00
Valere a363e392b4 Update to analytics events 0.23.0 and refactor 2024-05-29 17:39:16 +02:00
Valere 09c68f3421 Remove unused context in crypto service getCryptoVersion 2024-05-29 17:38:36 +02:00
ganfra 22f69ec6b0
Merge pull request #8743 from element-hq/feature/bma/editorIssue
Fix Rich Text Editor issues: save formatted text in draft and keep formatting when switching between modes
2024-05-28 10:52:51 +02:00
Valere 08c124e13b Add super properties to posthog (plateformCode) 2024-05-28 09:25:24 +02:00
Benoit Marty 2395d72c93 Fix regression on send button visibility. 2024-05-27 10:35:02 +02:00
Benoit Marty 4acbe4e582
Merge pull request #8820 from element-hq/feature/bca/bump_posthog_version_3
Bump posthog version to 3.2.0
2024-05-16 14:41:15 +02:00
Benoit Marty f9a84512ad
Merge pull request #8790 from element-hq/feature/bma/externalAnalyticsPlan
Add dependency on `com.github.matrix-org:matrix-analytics-events`
2024-05-16 14:39:03 +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 0e94a499c9
Merge pull request #8810 from yostyle/yostyle/fix_file_permission
fix: update local file access permission
2024-05-16 14:31:41 +02:00
Benoit Marty 2362fcde16
TODO must not be followed by `:` 2024-05-16 14:02:15 +02:00
Valere d100b62e54 Fix posthog tests 2024-05-06 10:31:45 +02:00
Valere 443db6ce8e Bump posthog version to 3.2.0 2024-05-06 09:28:53 +02:00
Hugh Nimmo-Smith a8a9c61a69 Add note about MSC3886, MSC3903 and MSC3906 being closed 2024-05-03 13:16:31 +01:00
Benoit Marty 305372cafc
Merge pull request #6225 from element-hq/feature/adm/android-12-deeplinks
Fixing Android 12 url deeplinks
2024-05-02 16:58:10 +02:00
yostyle 33d09ecf40 fix: update local file access permission 2024-04-18 16:29:02 +02:00
Valere 0a284bbeea Analyics: stop double reporting posthog utds 2024-04-04 13:09:10 +02:00
Benoit Marty 5ccc486b7c
Merge pull request #8795 from element-hq/sync-emojis
Sync Emojis
2024-04-02 22:19:17 +02:00
Benoit Marty 6cd9e6eedd When reporting a user, use the membership state eventId for the eventId. 2024-04-02 20:47:45 +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 9aaf29d4cf
Merge pull request #8797 from element-hq/feature/bma/reportUser
Report user
2024-04-02 18:08:44 +02:00
Benoit Marty b14cb81ece Add action to report a user form the user profile view. EventId is not relevant, but requested by the API. 2024-04-02 15:44:25 +02:00
Benoit Marty 99ec61e120 Add action to report a user form the message detail bottom sheet. #8796 2024-04-02 15:11:27 +02:00
Valere 752c884eaa Analytics | if no property use null instead of empty map 2024-04-02 11:44:05 +02:00
Valere 2bbb49bdd3 Fix: should remember already reported events 2024-04-02 09:33:10 +02:00