ganfra
a2f64e7f3c
Merge pull request #5576 from vector-im/feature/aris/thread_labs_notice_users
...
Threads Migration
2022-03-22 14:57:07 +01:00
ericdecanini
7449d15d2f
Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
2022-03-22 14:15:29 +01:00
ariskotsomitopoulos
c6593f0cee
PR remarks
2022-03-22 13:57:20 +02:00
ariskotsomitopoulos
a431d885f0
Increase the thread summaries limit
2022-03-22 11:20:47 +02:00
SpiritCroc
7723b45993
Open-at-unread: add option to not mark as read until fully read
...
Change-Id: Ie700cee773bce08248212ddd3fcc7793b4a919cc
2022-03-22 09:47:53 +01:00
SpiritCroc
6d5bdb4c88
Fix scroll-to-bottom jumping back to initial event
...
Change-Id: I4d5ad6e2b2c2e47d79f5da2fd596de69a04c687a
2022-03-21 21:23:07 +01:00
ganfra
794131d274
Merge pull request #5551 from SpiritCroc/local-echo
...
Fix local echos not being shown when re-opening rooms
2022-03-21 19:24:07 +01:00
SpiritCroc
d58e9bb944
Fix readmarker index calculcation if local echos exist
...
Change-Id: Ia1f0cfb719c2497d4aa840964432e7d39b299d40
2022-03-21 19:10:22 +01:00
SpiritCroc
ece413887a
Avoid inconsistent timelines by db insertions before fully loaded chunk
...
Change-Id: Icaf190630b3af8fec02b77808dd405c9e3598ec5
2022-03-21 10:48:59 +01:00
SpiritCroc
bea4cca2ab
Fix crash on Android 6
...
Change-Id: Ie32c3dbc4b22afd673c5dcf581f8743f27d5bfc3
2022-03-19 11:51:19 +01:00
ariskotsomitopoulos
e574fda099
Remove unused import
2022-03-18 14:55:14 +01:00
ariskotsomitopoulos
06db7e2374
Enhance migration logic & PR remarks
2022-03-18 14:51:06 +01:00
ariskotsomitopoulos
fd4d99d6fc
Possible NullPointerException crash fix
2022-03-18 14:50:34 +01:00
Valere
189683a8a1
Merge pull request #5552 from SpiritCroc/timeline-decryptor-crash
...
Fix crash when closing room during timeline decryption
2022-03-18 11:34:27 +01:00
ariskotsomitopoulos
a0e6dd5f6c
Merge branch 'develop' into feature/aris/thread_labs_notice_users
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
# vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
2022-03-18 11:28:21 +01:00
SpiritCroc
ab9caef466
TokenChunkEventPersistor: always link all matching chunks
...
The previous fix only works around the issue when it is detected. This
may require re-entering the room once when it gets stuck. If we ensure
proper linking from the beginning, hopefully we don't run into any
issues at all.
Change-Id: Idf0f1882ec4f197f58f3818e63386a4def838b25
2022-03-18 08:08:51 +01:00
ariskotsomitopoulos
2ca3387ab3
Migrate Threads and notify user
2022-03-17 18:51:54 +01:00
Arnaud Ringenbach
7593f7a2c6
Fix lint issues
2022-03-17 17:15:16 +01:00
Arnaud Ringenbach
d3459d1d3d
Use MatrixConfiguration & move presence sync enabled checks out of view
2022-03-17 14:50:15 +01:00
ericdecanini
fbb6f117d0
Fixes remote echo of end poll not processing correctly
2022-03-17 13:47:57 +01:00
Eric Decanini
9c8f29e853
Merge branch 'develop' into bugfix/eric/voting-ended-poll
2022-03-17 12:07:45 +01:00
Arnaud Ringenbach
4bcf31e0c2
Add a presence sync enabling build config
2022-03-17 11:43:07 +01:00
SpiritCroc
91259bef40
Ensure proper double linking of TimelineChunks
...
We need both directions so getOffsetIndex() produces correct results in
all cases.
2022-03-17 11:34:20 +01:00
SpiritCroc
0d43fc6861
Ensure proper double linking of TimelineChunks
...
We need both directions so getOffsetIndex() produces correct results in
all cases.
Change-Id: Icbb3810c664febba976b81ae882a6581dc0f6056
2022-03-17 11:10:01 +01:00
SpiritCroc
b982841ed5
Add read event tracking debugging
...
Change-Id: If9cc30f32af7bcadda9df6b04ad89ae248166da8
2022-03-17 10:58:39 +01:00
SpiritCroc
d92ce97f84
Open at unread: Do not show loading animation if already reached end
...
Change-Id: I90b0a92cddb779651983f69871fa1942f2f45785
2022-03-16 15:39:16 +01:00
SpiritCroc
581c0ffcb0
Fix endless loading timeline due to conflicting chunks
...
Change-Id: I46918ed17b0bd5b2ac6797bfd2a9e3ffa42f14b8
2022-03-16 14:33:28 +01:00
ariskotsomitopoulos
eee1ec1423
Merge branch 'develop' into feature/aris/threads_analytics
2022-03-16 13:19:08 +01:00
ariskotsomitopoulos
60db2e424e
Merge branch 'develop' into feature/aris/threads_analytics
2022-03-16 13:01:09 +01:00
SpiritCroc
a994f859e1
Fix crash when closing room during timeline decryption
2022-03-16 10:19:01 +01:00
SpiritCroc
da43865733
[TMP] More ReadMarker debugging
...
Change-Id: I1defffc997864db74e15fe6b06645adeed7b67fe
2022-03-16 09:27:48 +01:00
SpiritCroc
4bb246ffe1
Fix local echos not being shown when re-opening rooms
...
Change-Id: Ib07f290028b7e97b64f3712c2cac01b5038f8dc8
2022-03-15 19:43:07 +01:00
SpiritCroc
856f25f684
Fix local echos not being shown when re-opening rooms
2022-03-15 19:34:04 +01:00
Maxime NATUREL
9ef235f3d7
Merge pull request #5479 from vector-im/feature/mna/PSF-735-pinned-location
...
#5417 : Pinned location sharing
2022-03-15 17:40:21 +01:00
aringenbach
a7639f4424
Merge pull request #5544 from vector-im/aringenbach/5521_permalink_base_url_mention
...
Fix mentions using matrix.to rather than client defined permalink base url
2022-03-15 17:28:16 +01:00
Maxime Naturel
f495150b4e
Fixing asset type representation
2022-03-15 17:09:31 +01:00
Maxime Naturel
04405c7970
Distinguish user location and pinned location sharing
2022-03-15 17:09:30 +01:00
Arnaud Ringenbach
15e3f258f3
Fix wildcard imports
2022-03-15 16:55:24 +01:00
Onuray Sahin
db0cfd4704
Merge pull request #5455 from vector-im/feature/ons/fix_poll_start_notifications
...
Show notification for poll start events but not for responses
2022-03-15 18:34:03 +03:00
Arnaud Ringenbach
56760ecddc
Create SpanTemplateType and factorize template creation
2022-03-15 16:33:59 +01:00
SpiritCroc
4d8cedf6e5
Annoy-developer-toast: don't show for normal local echos
...
Change-Id: Ibec75423c5f7f7d4145e48f2da36e2b02f0caf7c
2022-03-15 16:11:22 +01:00
Onuray Sahin
a47b589e72
Code review fixes.
2022-03-15 17:51:02 +03:00
Onuray Sahin
7fa43f0d1b
Merge branch 'develop' into feature/ons/fix_poll_start_notifications
...
* develop: (163 commits)
Fix lint error.
Removes changelog file
Fix PR comment
Adds changelog file
Refactors MessageBubbleView
Updating changelog copy
making use of the fake overrides for testing
extracting the personalization complete emitting to a dedicated function
making use of binding api instead of manual findviewbyid
using consistent method naming for setting the capabilities override
taking the personalization feature flag into account when calculating if personalization is supported - also removes a legacy loading workaround for the account creation step, we're navigating to a new screen AccountCreated so we have to stop the loading
adding changelog entry
using correct label for the avatar capability debug override
forwarding to the profile picture flow when display name changing isn't supported but pictures are when personalising the profile
formatting
dynamically switching the onboarding flow based on the capabilities of the homeserver - when avatars can't be changed we complete the personlisation flow
hiding the toolbar back button and handling system back as take the user home if the display name personalisation is not supported
adding test around account creation via dummy
dynamically changing the account created layout based on if the homeserver supports personalisation
adding entry points for injecting and overriding the homeserver capabilities
...
2022-03-15 17:49:53 +03:00
ericdecanini
9806f1bf8f
Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
# vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt
2022-03-15 15:48:17 +01:00
Aris Kotsomitopoulos
e0b93c2d2c
Merge pull request #5298 from vector-im/feature/aris/thread_live_thread_list
...
Live Threads
2022-03-15 15:14:26 +01:00
Arnaud Ringenbach
094ebe6764
Fix ktlint on TestPermalinkService
2022-03-15 14:57:59 +01:00
Arnaud Ringenbach
a68471afe3
Fix documentation on PermalinkService
2022-03-15 14:54:24 +01:00
Arnaud Ringenbach
c7aab7a3f6
Remove useless imports on TextPillsUtils
2022-03-15 14:52:13 +01:00
Arnaud Ringenbach
55fbed1a81
Remove useless PermalinkFactory import
2022-03-15 14:49:55 +01:00
Arnaud Ringenbach
ea4addf446
Fix TestPermalinkService header
2022-03-15 14:45:04 +01:00
Arnaud Ringenbach
5b04686827
Fix MarkdownParser unit tests
2022-03-15 14:27:17 +01:00
ariskotsomitopoulos
07eabf110d
Merge branch 'feature/aris/thread_live_thread_list' into feature/aris/threads_analytics
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
2022-03-15 14:23:48 +01:00
ariskotsomitopoulos
8a862d006e
Merge branch 'develop' into feature/aris/thread_live_thread_list
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
2022-03-15 14:21:04 +01:00
Onuray Sahin
b4df6e1ae8
Merge branch 'develop' into feature/ons/poll_tests
...
* develop:
Fix lint error.
Fix lint error.
Avoid stable prefix
Support both unstable and stable prefixes.
2022-03-15 16:16:17 +03:00
Onuray Sahin
1a76914828
Merge pull request #5345 from vector-im/feature/ons/fix_unstable_prefixes
...
Support both unstable and stable prefixes
2022-03-15 15:16:16 +03:00
Onuray Sahin
f4bdaf6151
Fix lint error.
2022-03-15 14:47:19 +03:00
Onuray Sahin
dd3178c36e
Merge branch 'develop' into feature/ons/poll_tests
...
* develop: (150 commits)
Removes changelog file
Fix PR comment
Adds changelog file
Refactors MessageBubbleView
Updating changelog copy
making use of the fake overrides for testing
extracting the personalization complete emitting to a dedicated function
making use of binding api instead of manual findviewbyid
using consistent method naming for setting the capabilities override
taking the personalization feature flag into account when calculating if personalization is supported - also removes a legacy loading workaround for the account creation step, we're navigating to a new screen AccountCreated so we have to stop the loading
adding changelog entry
using correct label for the avatar capability debug override
forwarding to the profile picture flow when display name changing isn't supported but pictures are when personalising the profile
formatting
dynamically switching the onboarding flow based on the capabilities of the homeserver - when avatars can't be changed we complete the personlisation flow
hiding the toolbar back button and handling system back as take the user home if the display name personalisation is not supported
adding test around account creation via dummy
dynamically changing the account created layout based on if the homeserver supports personalisation
adding entry points for injecting and overriding the homeserver capabilities
extracting method for the handling of the profile picture selection
...
2022-03-15 14:39:51 +03:00
Arnaud Ringenbach
df794ee41f
Move template creation to PermalinkService
2022-03-15 11:26:47 +01:00
SpiritCroc
56cae372b4
Add Schildi-dbg settings
...
To control more invasive debugging
Change-Id: I7ee2980388db8999a76992ee7fffc70d8383a283
2022-03-15 11:19:53 +01:00
SpiritCroc
c214c2233f
[TMP] Update timeline debugging
...
And clean up some debugging that's probably not needed anymore
Change-Id: I3b154280487f02479f7c40b543da43ca39e9e2e3
2022-03-15 10:57:34 +01:00
Arnaud Ringenbach
4cf820cb12
Use client permalink base url on mentions if available
2022-03-15 10:34:04 +01:00
ariskotsomitopoulos
d7c486c55e
Add fallback support rendering proposed in MSC3676
2022-03-14 16:04:08 +01:00
ariskotsomitopoulos
d894d8598c
Format text
2022-03-14 12:44:25 +01:00
ariskotsomitopoulos
d215f03798
Merge branch 'develop' into feature/aris/thread_live_thread_list
2022-03-14 12:02:04 +01:00
ariskotsomitopoulos
c2ec7cfa0f
Add more clear documentation
2022-03-14 11:54:29 +01:00
Maxime Naturel
291d7d7627
Fix some doc comment
2022-03-14 11:15:19 +01:00
Maxime Naturel
3d27d9d2d2
Fix filtering use case
2022-03-14 11:15:18 +01:00
Maxime Naturel
b72c357dd1
Removing unused imports
2022-03-14 11:15:18 +01:00
Maxime Naturel
0aaa650ac3
Using flow to show items counter
2022-03-14 11:15:17 +01:00
Maxime Naturel
c7dae341c0
(DRAFT) Room counter flow
2022-03-14 11:15:17 +01:00
ericdecanini
f24d8c2ada
Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
2022-03-13 20:13:03 +01:00
SpiritCroc
d0909c1790
[TMP] Show inconsistencies toast for developers investigating this
...
Change-Id: I06165bddcae980db60750ef77925c7b65704f3a2
2022-03-12 10:38:02 +01:00
SpiritCroc
647dd4398e
Fix modifying the wrong events in TimelineChunk
...
I was observing cases where builtEvents[modificationIndex] was not
having the same eventId as the udpatedEntity in.
In particular, I observed both cases that
- there was no item in the list yet with the same eventId as the updated
one
- there was an item with the same eventId already in the list, but at a
different position.
Whenever this happened, the timeline would render missing, duplicated,
or swapped messages in the timeline.
Instead of relying on the modificationIndex to be the same for both the
change set and builtEvents, look up the proper index by eventId.
Change-Id: Ic03bdcc8210ec87b786795848f31e9085096b903
2022-03-12 09:32:25 +01:00
Onuray Sahin
a12f918dd5
Add poll test for users try to change their votes after poll is ended.
2022-03-11 19:19:20 +03:00
Benoit Marty
c89554c3f6
Merge pull request #5443 from vector-im/task/eric/stable-hierarchy-endpoint
...
Changes room hierarchy endpoint to stable
2022-03-11 17:05:13 +01:00
Onuray Sahin
7c6167ace9
Add poll test for ended polls.
2022-03-11 18:59:27 +03:00
Benoit Marty
fa104adefc
Fix all warnings in file E2eeSanityTests.kt
2022-03-11 15:35:21 +01:00
SpiritCroc
8d04a48157
Fix ChunkEntity.isMoreRecentThan() if both chunks linked to last forward
...
Imagine scenario:
[this] -> [chunkToCheck] -> [lastForwardChunk]
Then, both `isLastForward` checks will not return, and also the `chunkToCheck.doesNextChunksVerifyCondition { it == this }` will return false.
Since both chunks are connected to the last forward chunk, `isMoreRecent()` will still return `true`, which is wrong in this case.
So do not only check if chunkToCheck has this as any of the next chunks, but also the other way round.
Change-Id: I98727d85837e9b38a42297568df82f957b3a2dca
2022-03-11 11:29:43 +01:00
SpiritCroc
24133ba7b5
isReadMarkerMoreRecent(): use helper to properly compare chunks
...
Change-Id: I878b8145d3a9c85ea815f369e5d8f810343c8f62
2022-03-11 11:29:39 +01:00
Onuray Sahin
8b08d3db25
Fix poll test for users vote different options.
2022-03-11 11:36:06 +03:00
SpiritCroc
12e4853c59
[TMP] More missing message debugging
...
Change-Id: Ia6ad08fa6a51365ba6f4e5a880f9ce804f3026c5
2022-03-11 08:50:17 +01:00
dependabot[bot]
2d5638baaf
Bump libphonenumber from 8.12.44 to 8.12.45
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.44 to 8.12.45.
- [Release notes](https://github.com/google/libphonenumber/releases )
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md )
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.44...v8.12.45 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-10 23:09:19 +00:00
ericdecanini
7226864cc9
Improves code formatting in ResolveSpaceInfoTask
2022-03-10 21:41:17 +01:00
ericdecanini
fe3c9cc09f
Reverts to fix by removing event timestamp condition
2022-03-10 19:15:12 +01:00
ariskotsomitopoulos
f31b130b49
Fix unit tests
2022-03-10 19:11:14 +02:00
ariskotsomitopoulos
34cfdfb6fe
Merge branch 'develop' into feature/aris/thread_live_thread_list
2022-03-10 18:48:41 +02:00
Benoit Marty
becdd1ce29
Fix test compilation after method renaming
...
Also rename in the comment
2022-03-10 17:01:45 +01:00
ariskotsomitopoulos
a758ad71e6
Add is_falling_back support for rich thread replies
...
Enhance thread awareness handler so normal replies with thread disabled will be visible in te appropriate thread
Fix conflicts
2022-03-10 17:51:02 +02:00
ericdecanini
628a160c3a
Reverts timestamp condition but changes timing of setting closedTime
2022-03-10 16:32:42 +01:00
ericdecanini
080844dc9d
Removes event timestamp condition for sdk poll voting
2022-03-10 16:28:22 +01:00
Onuray Sahin
cd29b1aa4b
Add poll test for users vote different options.
2022-03-10 17:40:16 +03:00
Benoit Marty
66f76fbea3
Merge pull request #5450 from SpiritCroc/fix-5448
...
Fix missing messages when forward paging with chunks > 50 messages
2022-03-10 15:08:58 +01:00
Onuray Sahin
a5441fdf22
Add poll test for someone else chose the same option.
2022-03-10 16:51:23 +03:00
ericdecanini
a5af4783cc
Renames mapToSpaceChildInfoList to mapSpaceChildren in DefaultSpaceService
2022-03-10 14:41:44 +01:00
Onuray Sahin
f029759f9a
Add poll test for changing previous answer.
2022-03-10 15:47:40 +03:00
Onuray Sahin
1b348401bd
Add poll test for a single vote.
2022-03-10 15:31:32 +03:00
SpiritCroc
f5afdefe2f
Merge tag 'v1.4.4' into sc
...
Change-Id: Ibfb35ec30a51abebb652044719417f62c8a6be50
Conflicts:
library/ui-styles/src/main/res/values/dimens.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/res/drawable/bg_unread_notification.xml
vector/src/main/res/drawable/ic_add_reaction_small.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
vector/src/main/res/xml/vector_settings_preferences.xml
2022-03-10 13:26:09 +01:00
Benoit Marty
d83d5f9828
Merge pull request #5467 from vector-im/feature/bma/unused_resources_all
...
Remove unused resources
2022-03-10 13:03:27 +01:00
SpiritCroc
7bfd3c8dca
[TMP] Add some debugging to detect timeline inconsistencies
...
Note: may affect performance a little when loading the timeline, so
better revert when we are confident we have fixed the issue.
Change-Id: Ic4d31e47948984371a02ce51af7a8d56cb120234
2022-03-10 12:36:00 +01:00
Onuray Sahin
fd3e5128c7
Test initial poll event.
2022-03-10 14:30:03 +03:00