Commit Graph

12282 Commits

Author SHA1 Message Date
ganfra 721bf4fbd1
Merge pull request #4770 from vector-im/feature/adm/emoji-27-and-below-crash
Fixing Android 8.1.1 / 27 and below emoji crash
2021-12-20 11:41:18 +01:00
Adam Brown 18df540487 adding changelog entry 2021-12-20 10:10:07 +00:00
Adam Brown f1dff33dc2 removing android version bypass for using text futures
- the emoji span changes affect all android versions
2021-12-20 10:09:17 +00:00
ganfra c6a118fc1f Update versions to 1.3.12 2021-12-17 19:05:17 +01:00
ganfra cab28ffe7e Merge branch 'release/1.3.11' into main 2021-12-17 18:53:26 +01:00
ganfra f134ac6cdf Merge tag '1.3.11' into develop
no message
2021-12-17 18:53:26 +01:00
ganfra 6c127e9de5 Release: prepare CHANGES 2021-12-17 18:21:56 +01:00
Adam Brown a9cf7b3676 adding changelog entry 2021-12-17 16:55:30 +00:00
Florian Renaud 7e2eb2a21e Remove useless `val` in RoomListViewModel constructor 2021-12-17 17:31:24 +01:00
Florian Renaud c13feb983e Remove useless nullability in method param 2021-12-17 17:31:24 +01:00
Florian Renaud 61b74bb083 Add missing setting key constant 2021-12-17 17:31:00 +01:00
Florian Renaud fa92aff11c Add function to provide a Flow of a single UserAccountDataEvent 2021-12-17 17:31:00 +01:00
Florian Renaud 58f7c83f4e Skip issue triage actions in forks 2021-12-17 17:19:44 +01:00
ganfra 461beda634
Merge pull request #4742 from vector-im/feature/aris/fix_immutable_model_crash
Fix crash ImmutableModelException
2021-12-17 15:30:19 +01:00
Adam Brown 680c22d4c8 using app compat edit text for official emoji support 2021-12-17 13:41:19 +00:00
ganfra e155eefb7b
Merge pull request #4748 from vector-im/feature/adm/late-emoji-initialisation
Unable to render messages
2021-12-17 12:35:37 +01:00
ganfra ac65942c28
Merge pull request #4744 from vector-im/feature/adm/emoji-notice-fix
Emojis in emotes causing crashes on Android 12+
2021-12-17 11:47:16 +01:00
Adam Brown ddbf8582dd removing trailing space 2021-12-17 10:46:03 +00:00
Adam Brown 6918372a87 extracting the emoji processing to an interface so that we can override the behaviour in the unit test 2021-12-17 10:38:49 +00:00
Adam Brown b73bae452a
adding comment to explain SpannableStringBuilder usage 2021-12-17 09:37:50 +00:00
Adam Brown e1eafd2c64 adding changelog entry 2021-12-17 09:26:10 +00:00
Adam Brown 37db28ae7c using the safe emoji processor to avoid the timeline failing when processing the content and the emoji library hasn't initialised yet 2021-12-17 09:25:16 +00:00
Adam Brown 9e2fb1366f
Update changelog.d/4743.bugfix
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2021-12-17 09:22:12 +00:00
Valere 240ce6873b cleaning rendering of state event in timeline 2021-12-17 09:20:17 +01:00
ariskotsomitopoulos cc7e3ea78c Improve init thread query 2021-12-17 01:25:50 +02:00
ariskotsomitopoulos 5723465106 Fix local notification badge number 2021-12-17 01:23:09 +02:00
ariskotsomitopoulos a60f6e996a Enhance thread awareness to support stickers 2021-12-17 00:46:47 +02:00
ClaireGizard ca58a04f57
Small UI fix in room member profile hearder (#4700)
Small ui fix on room member profile name

Co-authored-by: Claire Gizard <cgizard>
2021-12-16 21:10:03 +01:00
ariskotsomitopoulos a187e0ec33 Enhance thread awareness to recognise the type of messages that are not able to be send as a reply such as images, videos, audios, stickers 2021-12-16 22:03:42 +02:00
ariskotsomitopoulos dca5bea744 Merge branch 'feature/aris/fix_immutable_model_crash' into feature/aris/threads 2021-12-16 20:56:10 +02:00
ariskotsomitopoulos f769d84443 Merge branch 'develop' into feature/aris/threads 2021-12-16 20:55:52 +02:00
ariskotsomitopoulos cabf12289b Add changelog 2021-12-16 20:39:21 +02:00
Adam Brown 049cad7d2c adding changelog entry 2021-12-16 18:37:03 +00:00
Adam Brown ae6be3fdc4 adding missing binding options emote content
- fixes android 12+ crash when certain emojis are used within the emote content
2021-12-16 18:34:00 +00:00
ariskotsomitopoulos 2275bdd4fa Fix crash ImmutableModelException 2021-12-16 20:14:21 +02:00
ariskotsomitopoulos 638d56c707 Fix update from develop/prod to threads 2021-12-16 17:10:29 +02:00
Benoit Marty 3b35be510f
Merge pull request #4729 from vector-im/feature/adm/avoid-leaking-window-when-showing-loading
Avoid leaking Activity Window when showing loading dialog
2021-12-16 11:07:23 +01:00
Benoit Marty addeec0ff8
Merge pull request #4731 from vector-im/feature/bma/center
Call banner: center text vertically
2021-12-16 10:51:37 +01:00
Benoit Marty 9adc946b7e
Merge pull request #4732 from vector-im/gradlew-update-7.3.2
Update Gradle Wrapper from 7.3.1 to 7.3.2
2021-12-16 09:55:37 +01:00
gradle-update-robot db1e0af4e5 Update Gradle Wrapper from 7.3.1 to 7.3.2.
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
2021-12-16 00:13:21 +00:00
Benoit Marty 818a8898b3 Call banner: center text vertically 2021-12-15 22:19:23 +01:00
Benoit Marty 63660ab496
Merge pull request #4728 from vector-im/feature/adm/proxity-sensor-not-releasing
Proximity sensor not releasing
2021-12-15 21:23:12 +01:00
Adam Brown eb9c46b9a2 adding changelog entry 2021-12-15 18:17:04 +00:00
Adam Brown 4c238e81cf dismisses any potential loading dialogs when the linked fragment is destroyed
- fixes leaking the activity window when the fragment is destroyed
2021-12-15 18:16:10 +00:00
Adam Brown 8c913d29cb adding changelog entry 2021-12-15 17:35:27 +00:00
Adam Brown 8b96d8cd8d only acquire a wake lock if a lock is not already held 2021-12-15 17:32:39 +00:00
ariskotsomitopoulos bc6e89b503 Disable user typing from thread timeline 2021-12-15 18:49:22 +02:00
ariskotsomitopoulos 3acdccb339 Disable polls from within threads but allow users to vote if the poll is a root thread message 2021-12-15 16:31:58 +02:00
ariskotsomitopoulos 20357ce5c4 - Fix remaining conflicts with develop
- Disable thread awareness when threads are enabled
2021-12-15 14:38:08 +02:00
ariskotsomitopoulos cd95fc41e4 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	library/ui-styles/src/main/res/values/dimens.xml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.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/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.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/MessageComposerViewEvents.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.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/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
#	vector/src/main/res/layout/fragment_room_detail.xml
2021-12-14 20:18:54 +02:00