f7a4cc4b31
Apply received patches from upstream
...
Change-Id: I0d4be766d0f75c3ba64494599e8f3c5d589d3410
2024-02-16 09:43:19 +01:00
355d091c94
Merge pull request #8757 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.29.0
...
Bump io.element.android:wysiwyg from 2.27.0 to 2.29.0
2024-02-12 08:06:36 +01:00
f05af3f8b3
increment_version.sh: Include changelog in git tag
...
Change-Id: I6df1673df359c0fd7ebbf7bb0af7d6b13a876774
2024-02-11 20:13:09 +01:00
707032f875
Translated using Weblate (Japanese)
...
Currently translated at 100.0% (180 of 180 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/ja/
2024-02-10 16:08:13 +00:00
ed5b084da3
Translated using Weblate (German)
...
Currently translated at 96.1% (173 of 180 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/de/
2024-02-10 01:26:42 +00:00
c8585921e7
Translated using Weblate (German)
...
Currently translated at 96.1% (173 of 180 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/de/
2024-02-10 01:26:42 +00:00
377ab9a23f
Translated using Weblate (German)
...
Currently translated at 96.1% (173 of 180 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/de/
2024-02-10 01:26:41 +00:00
fb593cd8b4
Bump io.element.android:wysiwyg from 2.27.0 to 2.29.0
...
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg ) from 2.27.0 to 2.29.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md )
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.27.0...2.29.0 )
---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-09 23:04:14 +00:00
e0c51bd168
Merge pull request #8749 from element-hq/feature/bma/locationAvatar
...
Location avatar
2024-02-06 16:02:02 +01:00
e340678349
changelog
2024-02-05 09:43:05 +01:00
6ea0129bee
Location sharing: use Room member avatar instead of profile avatar.
2024-02-02 18:36:29 +01:00
c6bb054fd7
Add a log when User is not kwown.
2024-02-02 17:25:00 +01:00
8b1bd7940d
Fix avatar with initial not displayed on message preview bottom sheet
2024-02-02 16:01:59 +01:00
ff439546c5
Improve cache of drawables used for rendering location pin.
...
In particular, use the Glide cache, and ensure that if an error occurs and later the avatar can be retrieved, the cache will be replaced.
Also limit cache size to 32.
Also use UserItem as a key, instead of just the userId, so that if displayName or avatarUrl change, there will be not cache hit.
2024-02-02 15:34:51 +01:00
343468717c
Add a test
2024-02-02 13:56:44 +01:00
d49f6bfbb6
Equivalent code.
2024-02-02 13:56:44 +01:00
d75ca516fc
Merge pull request #8741 from element-hq/fix/jme/update-login-splash-screen
...
Make 'sign in' flow more important in the initial screen
2024-02-02 09:58:16 +01:00
1277f6fdd9
Merge pull request #8744 from element-hq/feature/bma/usedDecryptedEvent
...
[Crypto] Improve Event.getClearContent() and fix assignement issue.
2024-02-02 09:47:22 +01:00
3611052386
Add changelog.
2024-02-02 09:46:44 +01:00
96648bbd0e
Merge pull request #8745 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.27.0
...
Bump io.element.android:wysiwyg from 2.25.0 to 2.27.0
2024-02-02 09:39:44 +01:00
393c40e652
Bump io.element.android:wysiwyg from 2.25.0 to 2.27.0
...
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg ) from 2.25.0 to 2.27.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md )
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.25.0...2.27.0 )
---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-01 23:41:07 +00:00
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
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
e04bfe8981
Remove dead code
2024-02-01 18:02:04 +01:00
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
a17c75a7da
Remove unused import
2024-01-31 18:49:19 +01:00
054af4d6a3
changelog
2024-01-31 18:31:56 +01:00
6a30a2ed32
Keep the current message formatting when switching between composer mode (Regular, Reply, etc.)
2024-01-31 18:28:39 +01:00
423b9215c4
Store the `formattedText` to the draft, to be able to restore the formatting. #7466
2024-01-31 18:28:39 +01:00
cc355a8e14
Merge pull request #8733 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.25.0
...
Bump io.element.android:wysiwyg from 2.24.0 to 2.25.0
2024-01-31 08:42:23 +01:00
4cd7c60032
Make 'sign in' flow more important in the initial screen
2024-01-30 12:20:56 +01:00
d7e7a319f0
Increment version
...
Change-Id: Id67482f897e5f28851077bec9c84045120b731a7
2024-01-21 10:42:22 +01:00
d418525748
Merge pull request #8734 from element-hq/feature/bma/fixRelease
...
Fix release script which download artifact
2024-01-17 17:55:40 +01:00
a5df7649a3
Merge pull request #8735 from davidegirardi/patch-1
...
Point to Element security@ address and policy
2024-01-17 09:55:26 +01:00
34c75bd6c2
Point to Element security@ address and policy
2024-01-17 09:27:39 +01:00
122018dd7b
fix typo
2024-01-15 10:56:15 +01:00
0a20220ef1
Added translation using Weblate (Rusyn)
2024-01-13 13:09:12 +00:00
0f3d22bc85
Bump io.element.android:wysiwyg from 2.24.0 to 2.25.0
...
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg ) from 2.24.0 to 2.25.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md )
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.24.0...2.25.0 )
---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-01-12 23:41:59 +00:00
a902199fe2
Automatic SchildiChat string correction
...
Change-Id: I86ce37dcc2bd6cc92d00585768b746d5f647acb8
2024-01-10 19:59:28 +01:00
3d58efb75a
Automatic upstream merge postprocessing
...
Change-Id: I0e54ab321170944352d07898179705e3ac667e49
2024-01-10 19:59:26 +01:00
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
20131ab024
[TMP] Automatic upstream merge preparation
...
Change-Id: I489ac980279e10d82764fca5e6942efc805d355c
2024-01-10 18:09:25 +01:00
e40ac752e9
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: I1823e449896c1b47d87f7dac6bd01349b3f902fd
2024-01-10 18:09:25 +01:00
42696eb31d
Fix parsing after artifact url change on GitHub
2024-01-09 14:04:55 +01:00
ee16ef06e9
version++
2024-01-09 12:20:07 +01:00
a080826242
Merge tag 'v1.6.10' into develop
...
tag
2024-01-09 12:16:39 +01:00
493093c2a7
Merge branch 'release/1.6.10' into main
2024-01-09 12:16:21 +01:00
ac79b2ee63
Adding fastlane file for version 1.6.10
2024-01-09 12:16:15 +01:00
5c6e1d5378
Changelog for version 1.6.10
2024-01-09 12:15:28 +01:00
4c8ffbd169
Merge pull request #8727 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.24.0
...
Bump io.element.android:wysiwyg from 2.22.0 to 2.24.0
2024-01-08 09:02:03 +01:00
SpiritCroc
Jorge Martin Espinosa
Suguru Hirahara
franconian
Mæve Rey
Kuchenmampfer
dependabot[bot]
Benoit Marty
Benoit Marty
davidegirardi
regzero76