Commit Graph

14596 Commits

Author SHA1 Message Date
SpiritCroc 96618eefda [merge] Fix enabling send-as-sticker button immediately on autocompletion
Change-Id: Id4cfa90b5856594bc25ba6fd7fd6a63c94e215c0
2023-06-27 20:58:57 +02:00
SpiritCroc e06a4b94c6 [merge] Fix crash on disabling wysiwyg from dev quick option
Fixes https://github.com/SchildiChat/SchildiChat-android-rageshakes/issues/1095

Change-Id: Ie8e2e41a0e162a785bc99d1083632f0d1e6cb227
2023-06-27 20:28:59 +02: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
valere 7205cd73d4 quality 2023-06-26 11:13:08 +02:00
valere 3e73137c18 Fixes new device detections banner problems 2023-06-26 10:48:58 +02:00
David Langley a065cd338c
Merge pull request #8440 from vector-im/jonny/feat/rich-text-mentions
[Rich text editor] Add mentions and slash commands
2023-06-21 11:26:13 +01:00
David Langley cfae6e9e51 Remove TODO causing failed lint check. 2023-06-21 09:49:44 +01:00
David Langley e988308dc6 Add space after mention inserstion. 2023-06-21 09:30:45 +01:00
jonnyandrew 9d239bf94d
Use proper API to insert mention from timeline user 2023-06-19 13:41:08 +01:00
Benoit Marty 4af2f700f7
Merge pull request #8541 from abaker/fix_fallback_key_sharing_strategy
Fix fallbackKeySharingStrategy
2023-06-16 13:05:30 +02:00
Yoan Pintas 710d21f6a4
Implement MSC3987: Push actions clean-up (#8530) 2023-06-16 09:13:13 +00:00
Alex Baker 572bdb6dfe Fix fallbackKeySharingStrategy
Signed-off-by: Alex Baker <alex@beeper.com>
2023-06-14 16:29:22 -05:00
David Langley cb64175c2b Fix line length and typo. 2023-06-09 19:43:26 +01:00
David Langley 3b887fdf4e Test room alias links and fix bug found with PillDisplayHander not handling them 2023-06-09 18:12:52 +01:00
David Langley 36b97b1647 Merge branch 'main' of github.com:vector-im/element-android into jonny/feat/rich-text-mentions 2023-06-09 16:05:46 +01:00
David Langley cfa0f95799 Add PillDisplayHandler tests for custom domains. 2023-06-09 16:02:09 +01:00
David Langley f3db4a857a always use getText().insert for adding pills 2023-06-09 14:58:17 +01:00
Benoit Marty 48df1136ca
Merge pull request #8471 from vector-im/bugfix/cjs/poll-finish-contents
Show correct details when a poll is ended.
2023-06-09 14:28:07 +02:00
David Langley 7d084f18a0
Merge pull request #8517 from vector-im/dla/feature/rte_paste_images
Update rich text editor library to support pasting of images
2023-06-09 13:22:05 +01:00
David Langley 38330a7b67 Update RTE library to support pasting of images. 2023-06-09 09:29:01 +01:00
Yoan Pintas 07e06957ef
Prompt the user when the invited MatrixId is not recognized (#8483) 2023-06-05 20:02:11 +00: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] 7f8a19f194
Bump org.checkerframework:checker from 3.34.0 to 3.35.0 (#8497) 2023-06-02 09:59:16 +00: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 8c1938987b Code review 2023-05-31 12:18:27 +02:00
valere dc969f502a ktlint 2023-05-31 10:55:56 +02:00
valere 2d335c1307 fix unit test 2023-05-31 10:42:46 +02:00
valere 268cbb83cd Make cryptoDevice calls suspendable 2023-05-30 23:47:50 +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
Chris Smith 37429c277b Show correct details when a poll is ended.
Previously, the "end poll" timeline item always showed the title
and options from the start event, regardless of whether any edits
had been made.

Now we show the latest edit, if available, falling back to the
original otherwise.
2023-05-26 12:06:41 +01: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 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
Benoit Marty cff9fbd008
Merge pull request #8439 from vector-im/yostyle/fix_crash_on_start_verification
Allow stateloss on verification dialogfragment
2023-05-25 09:36:40 +02:00
dependabot[bot] d5d5c9009b
Bump io.element.android:wysiwyg from 1.2.2 to 2.2.1 (#8464)
* Bump io.element.android:wysiwyg from 1.2.2 to 2.2.1

Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 1.2.2 to 2.2.1.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/1.2.2...2.2.1)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix compilation

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jonnyandrew <jonnya@element.io>
2023-05-24 10:14:22 +00:00
Valere 6da05a3804
Merge pull request #8462 from vector-im/feature/bca/fix_8445
Special text for re-verification after update
2023-05-24 10:10:52 +02:00
Valere 9f3255dd78
Merge pull request #8458 from vector-im/feature/bca/remove_legacy_per_device_verif
Remove legacy manually verify specific other device
2023-05-24 01:09:29 +02:00
valere bb59a758cf code review 2023-05-24 00:06:36 +02:00
David Langley cee6ec5939 Always allow users sign out
- Updates the dialog with a more helpful error message for the user, letting them know what happens if they logout without informing the homeserver.
2023-05-23 16:51:26 +01:00
valere 27f9be5eda Special text for re-verification after update 2023-05-23 13:08:14 +02:00
valere 2ea6cdba6f Fix app non responsive 2023-05-23 08:30:58 +02:00
valere 517af968e6 Remove legacy manually verify specific other device 2023-05-22 22:26:26 +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
jonnyandrew 3157a35b74
Add autocomplete to plain text composer 2023-05-18 13:09:35 +01:00
jonnyandrew 29d8845792
Add slash commands to rich text editor 2023-05-18 13:09:34 +01:00
jonnyandrew 2d1dcd34c0
Add mentions to rich text editor 2023-05-18 13:09:26 +01:00
yostyle dadad3501b Allow stateloss on verification dialogfragment 2023-05-17 11:10:42 +02:00
SpiritCroc 1b8cef9678 Fix live location render crash for Android < 7
Bring back proper implementation from 9ef870b927, probably gone due to mismerge?

Change-Id: I198488e57d9b800cee303373372b1fd165ddf7f1
2023-05-16 14:41:36 +02:00
Valere c9ed3abc36
Merge pull request #8436 from vector-im/feature/bca/update_analytics
Add sentry config for rust crypto
2023-05-15 21:44:02 +02:00