ariskotsomitopoulos
d509b3324c
Merge branch 'develop' into feature/aris/threads
2022-01-31 15:58:12 +02:00
Benoit Marty
91e444ca73
Merge pull request #5084 from vector-im/feature/bma/location_crash
...
Fix location crash
2022-01-31 14:42:53 +01:00
Adam Brown
9119cf059f
adding extra logging around the push rules to help determine if we're incorrectly filter out valid notifications
2022-01-31 12:06:21 +00:00
ariskotsomitopoulos
26eaa843b3
ktlint format
2022-01-31 13:56:17 +02:00
ariskotsomitopoulos
3253a252fb
Introduce ThreadsService by splitting TimelineService
2022-01-31 12:58:19 +02:00
Benoit Marty
83ed80e6d8
Rename fun for clarity
2022-01-29 07:40:41 +01:00
ariskotsomitopoulos
b1067e9a58
- ktlint format
...
- Update a text resource
2022-01-28 16:37:59 +02:00
ariskotsomitopoulos
1d6d8102b3
Further improve thread summary after forward scrolling
2022-01-28 14:11:03 +02:00
ganfra
c14eb050b1
Merge branch 'develop' into feature/fga/message_bubbles
2022-01-27 18:59:10 +01:00
ariskotsomitopoulos
78dfac52a7
ktlint format
2022-01-27 18:39:43 +02:00
ariskotsomitopoulos
b2a2fe2710
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
# tools/check/forbidden_strings_in_code.txt
# vector/build.gradle
# vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
# vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
# vector/src/main/java/im/vector/app/features/command/Command.kt
# vector/src/main/java/im/vector/app/features/command/CommandParser.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.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/TimelineViewModel.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/search/SearchResultItem.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.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/Navigator.kt
# vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
# vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
# vector/src/main/res/layout/fragment_timeline.xml
# vector/src/main/res/xml/vector_settings_labs.xml
2022-01-27 17:11:26 +02:00
ariskotsomitopoulos
554ece724e
- Remove counter from thread notifications
...
- Fix red dot on user mentioning
2022-01-27 14:55:34 +02:00
ariskotsomitopoulos
f53b711e0d
When thread disabled add thread replies within threads ( to the users with threads enabled )
2022-01-27 13:49:03 +02:00
ariskotsomitopoulos
358a7d0ec4
Handle latest thread message & root thread edition to update thread summary and thread list appropriately
2022-01-27 13:22:04 +02:00
Onuray Sahin
2ad7a020cf
Current user is not a king to end polls, check event sender id instead.
2022-01-27 00:00:29 +03:00
Onuray Sahin
db1152cb72
Allow ending polls if user created it.
2022-01-26 17:50:31 +03:00
ariskotsomitopoulos
92d082c26a
Improve thread message deletion
...
Fix thread summary after isLimited events
2022-01-26 14:07:07 +02:00
Adam Brown
0fda2a125a
fixing line length
2022-01-25 17:58:51 +00:00
ariskotsomitopoulos
c19b52cded
Enhance thread summary
...
Fix deleted root thread messages when show deleted messages are enabled/disabled
2022-01-25 18:21:42 +02:00
Benoit Marty
1ee29555c6
Merge branch 'develop' into feature/ons/static_location
2022-01-25 16:01:16 +01:00
Benoit Marty
589cfeb0cc
ktlint
2022-01-25 16:00:52 +01:00
Benoit Marty
9f4deabe08
Merge pull request #5043 from vector-im/feature/bma/track_performance
...
Track performance
2022-01-25 15:54:57 +01:00
Benoit Marty
d9386cd61f
ktlint
2022-01-25 15:54:15 +01:00
Benoit Marty
63b3def667
Merge pull request #5008 from SpiritCroc/globstar
...
Speed up event match regex evaluation for big messages
2022-01-25 15:52:55 +01:00
Benoit Marty
b619f70904
Merge branch 'develop' into feature/ons/static_location
2022-01-25 14:29:13 +01:00
ariskotsomitopoulos
b1b27bdd0e
Enhance edit to support new threads fallback
2022-01-25 14:12:13 +02:00
Benoit Marty
80d9b64e5a
Cover also the error case.
2022-01-24 22:49:34 +01:00
Benoit Marty
cf86fe34d5
Improve SDK API (self review)
2022-01-24 22:37:07 +01:00
Onuray Sahin
d65899ef88
Fix sharing location action in timeline.
2022-01-24 21:55:32 +03:00
ariskotsomitopoulos
fe88e81d4a
- Refactor thread awareness (handle decrypted rooms, images, stickers etc)
...
- Enable/disable threads functionality
- New fallback thread implementation
2022-01-24 16:55:15 +02:00
Onuray Sahin
b0b92c062e
Undisclosed poll implementation.
2022-01-24 14:31:50 +03:00
Onuray Sahin
7f97e78ba3
Merge branch 'develop' into feature/ons/edit_polls
...
* develop: (66 commits)
toolbar management (#4887 )
adding changelog entry
adding back periodic flag when scheduling automatic background workers
Fix enum class warning
Split long lines Done by https://github.com/matrix-org/matrix-analytics-events/pull/16
Add new class in analytics plan
Fix conditional for Delight issue automation
Add missing import in kdoc
Update kdoc
Enable Delight issue automation
Fix an error in string resource (#4997 )
Changelog
Add some unit test for the command parser. Not all commands are covered, could add more tests later.
data class.
use sealed interface
Small cleanup
Command parser is not a static object anymore
Add changelog
Use Throwable.isLimitExceededError extension
Do not automatically retry 429 with a too long delay
...
2022-01-23 22:15:36 +03:00
Onuray Sahin
9dd48045f6
Invalidate previous votes for edited polls.
2022-01-23 19:32:13 +03:00
Benoit Marty
f6d856d828
Analytics: report performance event about sync request - send number of joined rooms
2022-01-21 17:42:40 +01:00
Benoit Marty
cab06c4b52
Analytics: report performance event about sync request
2022-01-21 16:44:19 +01:00
Onuray Sahin
a871ce26c2
Fix event id of poll replace events.
2022-01-21 18:07:39 +03:00
ganfra
8c4dff4db9
Bubbles: change again url preview
2022-01-21 16:00:58 +01:00
Onuray Sahin
ea9e5183dc
Fix rendering edited polls in timeline.
2022-01-21 16:20:08 +03:00
Adam Brown
e8f412b8a1
adding back periodic flag when scheduling automatic background workers
2022-01-20 17:07:14 +00:00
Onuray Sahin
c3d7a253e4
Allow editing polls.
2022-01-20 17:41:03 +03:00
SpiritCroc
af34399135
Speed up event match regex evaluation for big messages
...
`regex.containsMatchIn()` for `.*@room.*` can take significantly longer
than checking for `@room` (some real-world events I was getting took
around 15 seconds with this, significantly slowing down the sync
parsing).
Checking `containsMatchIn()` does not lead to different results when
having leading and trailing stars however, it will match in the same
cases as when these are omitted.
For testing purposes, I sent myself some Lorem Ipsum with 5000 words
(not containing any @room).
Without this change, the regex evaluation takes about 16 seconds.
With this change, the regex evaluation now takes significantly less then
a second.
2022-01-20 12:16:34 +01:00
ariskotsomitopoulos
e0630ceac0
Fix mentions UI within threads
2022-01-20 13:02:35 +02:00
Florian Renaud
b8fa6f9ec8
Add missing import in kdoc
2022-01-20 10:50:07 +01:00
Florian Renaud
879d5eb5f6
Update kdoc
2022-01-20 10:49:02 +01:00
ariskotsomitopoulos
38f193fbd5
Add LightweightSettingsStorage in sdk
...
Enable thread awareness when threads are disabled
Enhance enable/disable thread messages to app & sdk
Add Shared PReferences to sdk
2022-01-19 18:52:02 +02:00
Florian Renaud
83c961e255
Use Throwable.isLimitExceededError extension
2022-01-19 16:56:00 +01:00
Florian Renaud
fd61f07373
Do not automatically retry 429 with a too long delay
2022-01-19 16:56:00 +01:00
ariskotsomitopoulos
8cc96e27bc
- Add threads to lab settings
...
- Disable thread awareness due to the new fallback mechanism
2022-01-19 12:28:00 +02:00
ariskotsomitopoulos
4cff3938e7
- Hide read receipts from thread timeline
...
- Enhance FetchThreadTimelineTask
2022-01-18 16:05:41 +02:00
ariskotsomitopoulos
707397cb9d
cleanup
2022-01-18 15:28:44 +02:00
Onuray Sahin
7993ff39a5
Add missing fields to location event content.
2022-01-18 15:33:48 +03:00
ariskotsomitopoulos
636474b748
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
# vector/src/main/java/im/vector/app/features/command/Command.kt
# vector/src/main/java/im/vector/app/features/command/CommandParser.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
2022-01-18 12:41:40 +02:00
ariskotsomitopoulos
5e23947419
Enhance filtering to support threads
2022-01-17 19:22:22 +02:00
Onuray Sahin
5581e0b5ba
Code review fixes.
2022-01-17 18:30:04 +03:00
ariskotsomitopoulos
81a1dfd66d
PR Remarks
2022-01-17 17:28:40 +02:00
Benoit Marty
eafb76b9b6
Merge pull request #4960 from vector-im/feature/aris/improve_local_echo_stuck_fix
...
Avoid deleting sent messages on non room events
2022-01-17 15:26:46 +01:00
Benoit Marty
c59bb5740a
Add comment after merge of #4952
2022-01-17 15:24:51 +01:00
Benoit Marty
95b116b8a1
Merge pull request #4952 from abaker/disable_http_2
...
Force HTTP/1.1
2022-01-17 15:20:23 +01:00
ariskotsomitopoulos
b343739a71
Enhance decrypted thread summary to return poll questions
2022-01-17 14:27:17 +02:00
ariskotsomitopoulos
52348e399e
ktlint fixes
2022-01-17 13:30:59 +02:00
ariskotsomitopoulos
879c4ffef6
Improve logic
2022-01-17 13:00:34 +02:00
ariskotsomitopoulos
01ade64f3b
fix ktlint format
2022-01-17 12:27:53 +02:00
ariskotsomitopoulos
3656896af9
Avoid deleting sent messages on non room events
2022-01-17 12:13:01 +02:00
ariskotsomitopoulos
53b82dfa3f
Fix permalink handling for threads regarding timeline changes
2022-01-14 13:02:08 +02:00
Benoit Marty
31e487b073
Merge pull request #4911 from vector-im/feature/nfe/rename_kick_command
...
Remove "X kicked X" terminology when removing people from a room
2022-01-14 08:42:18 +01:00
Alex Baker
7e4e8339e6
Force HTTP/1.1
...
Signed-off-by: Alex Baker <alex@beeper.com>
2022-01-13 17:50:24 -06:00
fedrunov
d92e0e48f6
code review changes
2022-01-13 17:50:38 +01:00
Benoit Marty
1b24b9d764
Merge pull request #4895 from vector-im/feature/bma/empty_state_key
...
Avoid allowing null String for state_key.
2022-01-13 12:00:48 +01:00
Benoit Marty
a16a6a6eeb
Merge pull request #4935 from vector-im/feature/bma/fix_legals
...
Fix #4919
2022-01-13 11:59:46 +01:00
Benoit Marty
18359fedb3
Fix #4919
2022-01-12 18:08:37 +01:00
ariskotsomitopoulos
b89054685f
Fix migration from 21 to 22
2022-01-12 18:40:33 +02:00
ariskotsomitopoulos
9d48ecea2f
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# .github/workflows/integration.yml
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/MessageComposerViewState.kt
2022-01-12 18:20:50 +02:00
ariskotsomitopoulos
6f5f773360
Fix kltint errors
2022-01-12 16:45:15 +02:00
ariskotsomitopoulos
b92cb753f9
Fix stuck local echo events at the bottom of the screen
2022-01-12 15:31:54 +02:00
Valere
7839f18f58
prevent OrderedRealmCollection to throw when using first()
2022-01-12 11:37:02 +01:00
Valere
f4c891abe6
Ensure algorithm instance is created and stored
2022-01-12 10:36:56 +01:00
ariskotsomitopoulos
4560d748d3
Display encrypted messages in thread summary and in thread list
2022-01-11 17:52:14 +02:00
fedrunov
9ec662ccdc
replace "kick" with "remove"
2022-01-11 16:21:42 +01:00
Valere
60ae416b36
Split this PR db change in a separate migration
2022-01-11 15:14:45 +01:00
Valere
1a92d75a54
Fix bad copyright
2022-01-11 14:56:31 +01:00
Valere
b10bc7000a
Update room badge when e2e misconfigured
2022-01-11 14:56:31 +01:00
Valere
38fbfad8d5
Code review
2022-01-11 14:56:31 +01:00
Valere
6b05e7a6bb
Support misconfigured room encryption
2022-01-11 14:56:31 +01:00
ariskotsomitopoulos
753e3e7519
- fix ktlint format
...
- Update Threads toolbar UI
2022-01-11 15:31:21 +02:00
ariskotsomitopoulos
3bd21d04d8
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
# tools/check/forbidden_strings_in_code.txt
2022-01-11 14:09:49 +02:00
Onuray Sahin
9ea30445ef
Merge branch 'develop' into feature/ons/static_location
...
* develop: (281 commits)
Add a comment about the workaround
Remove deprecated restricted lab option (#4889 )
Bump actions/github-script from 3 to 5.1.0
Add some missing language in the change language screen
Workaround to not to reuse poll option cells.
Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10
Changelog
Test: Fix test after change on OnBoarding screens
Test: Analytics opt-in
Cleanup
Revert "Disable automatic opt-in screen display."
- Do not add GitHub comments on successful ktlint runs - Remove already existing comments when ktlint succeed
restore deprecated lab preference
Update nb of enum classes
Change autoUisi label + rename matching_issue
code review
Fix enabling was broken
Simple rate limiting of RS sending
use flow instead of reactivex
Fix UISIS preference listener
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
# vector/src/main/res/layout/view_attachment_type_selector.xml
# vector/src/main/res/values/strings.xml
2022-01-11 14:42:11 +03:00
ariskotsomitopoulos
37ec3fdf84
Refactor threads to support the new timeline implementation
2022-01-11 12:13:53 +02:00
Benoit Marty
7be01ab7ae
Avoid allowing null String for state_key. Should always be an empty String according to the Matrix specification.
...
There is no functional change, just a change in the SDK API for clarity regarding the Matrix specs.
2022-01-10 17:47:27 +01:00
ariskotsomitopoulos
1b41a72e72
Fix Quote from within a thread
2022-01-10 14:14:11 +02:00
ariskotsomitopoulos
6503412928
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
2022-01-10 13:26:57 +02:00
ariskotsomitopoulos
e541636802
Make TimelineSettings aware of rootThreadEventId and welcome a new Thread mode for the timeline creation
2022-01-10 11:20:31 +02:00
Valere
de08afdfad
code review
2022-01-10 09:41:51 +01:00
Valere
6a34b999f2
New SDK Api for to device and event stream listener
2022-01-10 09:41:51 +01:00
Benoit Marty
d14dadde27
Merge branch 'develop' into feature/dla/fix_reply_and_quote_newlines
2022-01-07 14:43:41 +01:00
ariskotsomitopoulos
ac5caccdf9
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.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/timeline/DefaultTimeline.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
# tools/check/forbidden_strings_in_code.txt
# 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/res/menu/menu_timeline.xml
2022-01-07 13:29:43 +02:00
Benoit Marty
b46b76c22a
Merge pull request #4753 from vector-im/feature/fre/tagged_events
...
Support tagged events in Room Account Data (MSC2437)
2022-01-06 21:06:44 +01:00
Florian Renaud
8d7b2ab5d8
Add missing json class annotation
2022-01-06 15:32:14 +01:00
Benoit Marty
17e485fde1
Merge pull request #4826 from vector-im/feature/bma/nick_color_final
...
Nick color
2022-01-05 22:01:03 +01:00
Benoit Marty
fd854a6172
Merge pull request #4856 from vector-im/feature/bca/posthog_e2e
...
Track decryption failures
2022-01-05 18:54:21 +01:00
Valere
b275546a8a
Code review + reduce grace period
2022-01-05 16:43:05 +01:00
Valere
e5431d9fb4
Track decryption failures
2022-01-05 16:43:05 +01:00
Benoit Marty
608e01abf1
Merge branch 'develop' into feature/bma/nick_color_final
2022-01-05 16:33:13 +01:00
Benoit Marty
fc7beb7e5f
Prefer usage of any or none rather indexOfFirst wherever it is possible
2022-01-05 15:24:20 +01:00
Benoit Marty
884fb629c3
ktlint
2022-01-04 18:21:03 +01:00
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
