befb402dbe
Merge remote-tracking branch 'cintek/pin_messages' into sc
...
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/202
@SpiritCroc edit:
- change some merge-unfriendly things, e.g.
- indention
- strings_sc.xml
- don't touch what shouldn't be touched
- add icon license to third party
- add FEATURES.md entry
Conflicts:
library/ui-strings/src/main/res/values/strings.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
vector-config/src/main/res/values/config-settings.xml
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
Change-Id: I490e42d50276edce3e7b099a11dba90d040d0dc0
2023-08-02 19:41:24 +02:00
16ccd7817f
Add non-free warning to integration manager
...
https://github.com/SchildiChat/SchildiChat-android/issues/130#issuecomment-1657198941
Change-Id: I0f5af145697f14b2e6e83095993fdb158b41b3d8
2023-07-30 19:50:57 +02:00
6b5bfde91e
Merge tag 'v1.6.5' into sc
...
tag
Change-Id: I4b548719336b58914ac6b52da5a2ea6fac0c4545
2023-07-26 11:01:57 +02:00
61205787a8
Fix banned users alignment in room settings
...
Use new "labs" icon from Element, that we have changed back to the old
one for settings - but since it's a bit too big (even upstream),
fix width/height in addition.
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/200
Change-Id: I9195df80a5dadb9e70799ed3dc49f5702335ac49
2023-07-21 15:31:55 +02:00
ae52d4cd3c
Fix crash in the setting when enabling/disabling integration manager and there is no network.
2023-07-11 18:10:54 +02:00
2a5df54ae4
Fix crash: show an error message with a Retry button when there is no network when displaying the BootstrapBottomSheet.
2023-07-11 18:09:00 +02:00
96618eefda
[merge] Fix enabling send-as-sticker button immediately on autocompletion
...
Change-Id: Id4cfa90b5856594bc25ba6fd7fd6a63c94e215c0
2023-06-27 20:58:57 +02:00
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
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
2b4b5f05eb
Merge pull request #8556 from vector-im/feature/bma/noJcenter
...
Feature/bma/no jcenter
2023-06-27 17:04:59 +02:00
7205cd73d4
quality
2023-06-26 11:13:08 +02:00
3e73137c18
Fixes new device detections banner problems
2023-06-26 10:48:58 +02:00
e9f9decf00
Import source from https://github.com/dm77/barcodescanner
2023-06-23 18:58:42 +02:00
69680a9856
Import source from https://github.com/2dxgujun/Kpan
2023-06-23 18:23:14 +02:00
cd292488b6
Fix warning
2023-06-23 17:51:57 +02:00
3da1497d27
Import source from https://github.com/natario1/Autocomplete
2023-06-23 17:46:12 +02:00
f304e40d57
Import source from https://github.com/amulyakhare/TextDrawable
2023-06-23 17:35:14 +02:00
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
cfae6e9e51
Remove TODO causing failed lint check.
2023-06-21 09:49:44 +01:00
e988308dc6
Add space after mention inserstion.
2023-06-21 09:30:45 +01:00
9d239bf94d
Use proper API to insert mention from timeline user
2023-06-19 13:41:08 +01:00
4af2f700f7
Merge pull request #8541 from abaker/fix_fallback_key_sharing_strategy
...
Fix fallbackKeySharingStrategy
2023-06-16 13:05:30 +02:00
710d21f6a4
Implement MSC3987: Push actions clean-up ( #8530 )
2023-06-16 09:13:13 +00:00
572bdb6dfe
Fix fallbackKeySharingStrategy
...
Signed-off-by: Alex Baker <alex@beeper.com>
2023-06-14 16:29:22 -05:00
cb64175c2b
Fix line length and typo.
2023-06-09 19:43:26 +01:00
3b887fdf4e
Test room alias links and fix bug found with PillDisplayHander not handling them
2023-06-09 18:12:52 +01:00
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
cfa0f95799
Add PillDisplayHandler tests for custom domains.
2023-06-09 16:02:09 +01:00
f3db4a857a
always use getText().insert for adding pills
2023-06-09 14:58:17 +01:00
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
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
38330a7b67
Update RTE library to support pasting of images.
2023-06-09 09:29:01 +01:00
07e06957ef
Prompt the user when the invited MatrixId is not recognized ( #8483 )
2023-06-05 20:02:11 +00:00
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
7f8a19f194
Bump org.checkerframework:checker from 3.34.0 to 3.35.0 ( #8497 )
2023-06-02 09:59:16 +00:00
2f1a7b76ad
Merge pull request #8485 from vector-im/feature/bca/fix_anrs
...
Make cryptoDevice calls suspendable
2023-06-01 16:36:29 +02:00
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
7e6376bf90
remove log
2023-05-31 15:14:28 +02:00
8c1938987b
Code review
2023-05-31 12:18:27 +02:00
dc969f502a
ktlint
2023-05-31 10:55:56 +02:00
2d335c1307
fix unit test
2023-05-31 10:42:46 +02:00
268cbb83cd
Make cryptoDevice calls suspendable
2023-05-30 23:47:50 +02:00
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
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
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
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
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
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
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
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
SpiritCroc
Benoit Marty
Benoit Marty
valere
David Langley
jonnyandrew
Yoan Pintas
Alex Baker
dependabot[bot]
Alex Maras
Chris Smith