Florian Renaud
daadf72ffe
Code review
2022-01-04 18:04:30 +01:00
Florian Renaud
f008abde4f
Merge branch 'develop' into feature/fre/tagged_events
2022-01-04 17:23:04 +01:00
Benoit Marty
7bbea52e66
Merge branch 'develop' into feature/bma/math_final
2022-01-04 16:13:23 +01:00
Benoit Marty
39ff9da3c1
Merge pull request #4846 from vector-im/feature/dla/fix-unread-message-indicator-no-messages
...
Fix unread messages indicator on room list if no messages
2022-01-04 15:57:26 +01:00
Benoit Marty
df957971a8
Add some logs to try to understand an error on the production app. Also propagate the exception if this is not a registration flow response.
2022-01-04 14:44:08 +01:00
David Langley
9f13a9df54
If latestPreviewableEvent is null we should return false(no messages in room).
2022-01-04 12:20:56 +00:00
ganfra
91215854f4
Merge branch 'develop' into feature/fga/timeline_chunks_rework
2022-01-03 16:07:05 +01:00
ganfra
12b775c26d
Timeline : clean after PR reviews
2022-01-03 16:06:48 +01:00
Benoit Marty
b39caeb04d
2 new enums
2022-01-03 15:27:59 +01:00
Benoit Marty
98df733257
Split long line and use Kotlin style
2022-01-03 15:25:21 +01:00
ariskotsomitopoulos
f9e03aa99e
Remove unused code
2022-01-03 11:33:38 +02:00
ariskotsomitopoulos
694b8de034
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# library/ui-styles/src/main/res/values/dimens.xml
2022-01-03 11:08:22 +02:00
Benoit Marty
95b1ae9488
Merge branch 'develop' into maths
2021-12-31 16:41:06 +01:00
Benoit Marty
454baf8beb
Merge branch 'develop' into feature/issue-2610-override-nick-color-via-user-account-data
2021-12-31 13:02:24 +01:00
Benoit Marty
5407c84b2f
Merge pull request #4783 from vector-im/feature/adm/unable-to-change-avatar
...
Unable to change avatar due to `NetworkOnMainThread`
2021-12-30 12:30:18 +01:00
Benoit Marty
3abba1932f
Workaround to fetch all the pending toDevice events from a Synapse homeserver ( #4614 )
...
Workaround to fetch all the pending toDevice events from a Synapse homeserver
Co-authored-by: Valere <valeref@matrix.org>
2021-12-30 10:28:52 +01:00
ariskotsomitopoulos
0e30f4e817
Fix code quality issues
2021-12-25 23:35:40 +02:00
ariskotsomitopoulos
9ef4e1e83f
Fix code quality issues
2021-12-25 13:42:53 +02:00
ariskotsomitopoulos
581f71e89d
Remove unused code
2021-12-23 17:22:27 +02:00
ariskotsomitopoulos
f06397023a
Add support when there no threads messages to init timeline. Init as the normal one and hide them on the app side. That is also helpful to work to load all the threads when there is no server support
2021-12-23 17:19:36 +02:00
ariskotsomitopoulos
5a7d12a9a5
Enhance RoomEventFilter with MSC3440
2021-12-21 20:04:50 +02:00
ariskotsomitopoulos
ed48eb38c9
Apply ktlinFormat
2021-12-21 13:23:17 +02:00
Adam Brown
7714445d24
moving the updateAvatar work to the io dispatcher
...
- fixes some devices/OS's from attempting to run okhttp on the main thread
2021-12-21 09:33:25 +00:00
Adam Brown
18b38fe21e
making the file upload file creation all happen on the IO dispatcher
2021-12-21 09:33:25 +00:00
Florian Renaud
3bd2b77af3
Fix package name
2021-12-17 15:55:26 +01:00
Florian Renaud
706c5b2b32
Add tagged events model
2021-12-17 15:54:20 +01:00
Florian Renaud
f9b69fff9e
Add tagged event entry in room account data types
2021-12-17 15:39:25 +01:00
Onuray Sahin
6495bd9e5e
Send location event.
2021-12-17 15:09:02 +03: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
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
638d56c707
Fix update from develop/prod to threads
2021-12-16 17:10:29 +02:00
David Langley
e7bb030d52
full markdown should work in replies, was hardcoded to simple irrespective of prefrence.
2021-12-16 14:10:49 +00:00
David Langley
bc6ca2449e
Add advanced parser annotation
2021-12-16 13:13:40 +00:00
David Langley
a3a8a5b0b5
Extract reply formatting
2021-12-16 12:47:06 +00: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
David Langley
13dc2d5b76
Fix documentation.
2021-12-15 10:03:14 +00:00
David Langley
bef238f851
Add simple parser for use with just quotes/replies
2021-12-14 20:40:44 +00: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
David Langley
96062b7daa
Enable on replies and quotes even if preference is disabled to fix newline issues.
2021-12-14 17:10:54 +00:00
ariskotsomitopoulos
6a33c41091
Fix stickers in unencrypted rooms
2021-12-14 17:45:07 +02:00
ariskotsomitopoulos
2aa24f0a0d
Fix threads sort order, newest first
2021-12-14 16:30:59 +02:00
David Langley
20b5742227
Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_reply_and_quote_newlines
2021-12-14 13:46:45 +00:00
ariskotsomitopoulos
5ceed4096e
Fix threads sort order, newest first
2021-12-14 15:44:38 +02:00
ariskotsomitopoulos
d56281dca7
- Enhance local notification to work with read receipt & the latest chunk
...
- Local notification mentioning system
- Fix/Improve thread list filtering
2021-12-14 13:35:08 +02:00
Benoit Marty
fa060051ed
Merge pull request #3970 from vector-im/feature/ons/fallback_keys
...
Fallback keys implementation
2021-12-13 23:36:20 +01:00
Onuray Sahin
f028f9836b
Merge branch 'develop' into feature/ons/poll_timeline
...
* develop: (49 commits)
Update changelog.d/4592.bugfix
Remove jcenter from here, let's see what the CI will say
Common struct for each maven repo
Rename the file to group them
Add changelog file
Revert PR 4592 for devtools
Enhance include groups implementation by decoupling them to a separate file
Cleanup
Legals: improve API to get homeserver terms
Legals: update setting icon
Auto-review
Add a help section in the settings.
Changelog
Color for links
Use same height than the loading item to avoid dynamic resizing
Legals: only display external URLs.
Legals: Move the 2 copyrights items to the new legal screen
Add some space between the 2 TextViews, and improve the layout
Legals: Move the 3 element links to the new legal screen
Rename some classes
...
# Conflicts:
# vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
# vector/src/main/res/layout/item_timeline_event_poll_stub.xml
2021-12-13 17:44:21 +03:00
Valere
76960f8b67
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
...
Co-authored-by: poljar <poljar@termina.org.uk>
2021-12-10 16:12:14 +01:00
