Benoit Marty
627a1291b0
Move `awaitCallback()` extension to api package
2022-04-12 15:38:20 +02:00
Benoit Marty
ccce552097
Move `md5()` extension to api package
2022-04-12 15:38:20 +02:00
Benoit Marty
0cb770334c
Move content data class to api package
2022-04-12 15:38:20 +02:00
Benoit Marty
03dba3bbba
Move `SavedKeyBackupKeyInfo` to api package
2022-04-12 15:38:20 +02:00
Benoit Marty
a3575fbc6b
Move `PrivateKeysInfo` to api package
2022-04-12 15:38:20 +02:00
Benoit Marty
3895ac85d8
Move `SyncService` to api package
2022-04-12 15:38:20 +02:00
Benoit Marty
1684ba1d14
Move `ElementToDecrypt` to api package
2022-04-12 15:38:20 +02:00
Benoit Marty
24d044b147
Move `DeviceTrustLevel`, `DeviceTrustResult` and `UserTrustResult` to api package
2022-04-12 15:38:20 +02:00
Benoit Marty
567f298bd0
Remove unused code.
2022-04-12 15:38:20 +02:00
Benoit Marty
7711eb584c
Move `SignInvitationResult` and `RoomAliasDescription` to api package
2022-04-12 15:38:20 +02:00
Benoit Marty
73d22d0622
Move SpacePeekResult to api package, and cleanup
2022-04-12 15:38:20 +02:00
Benoit Marty
b4dbb389b1
Internal + add some doc
2022-04-12 15:38:20 +02:00
Benoit Marty
83570dc24b
Move TextContent class to `api` package
...
It is used by the app. Make the extensions internal
2022-04-12 15:38:20 +02:00
Benoit Marty
dc092f889b
Add missing `internal` keyword.
...
Classes marked with `internal` will be excluded from Kdoc.
2022-04-12 15:38:20 +02:00
aringenbach
047a45d77f
Add a setting to be able to always appear offline ( #5583 )
...
Add a setting to be able to always appear offline
Move presence enabling to a app-only preference
2022-04-12 12:08:56 +02:00
SpiritCroc
7c35f5fda5
Merge tag 'v1.4.11' into sc
...
Change-Id: I454f1ec4f1df6366065d5690d9704eb1bd573c2d
Conflicts:
dependencies_groups.gradle
library/ui-styles/build.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
vector/src/main/AndroidManifest.xml
vector/src/main/assets/open_source_licenses.html
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.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/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/res/menu/menu_timeline.xml
2022-04-12 11:57:16 +02:00
David Langley
454a65602b
Merge pull request #5639 from vector-im/feature/dla/uisi_match_web_implementation
...
Align Autorageshake with web implementation
2022-04-12 10:36:43 +01:00
SpiritCroc
1e62bbfdb3
TokenChunkEventPersistor: log sync tokens
...
Change-Id: I916808b1839171b8bd96dc5560d97c43c801165b
2022-04-12 11:02:36 +02:00
David Langley
363afd0089
Update naming to InitialSyncProgressing for clarity.
2022-04-12 09:35:35 +01:00
Benoit Marty
836a12d047
Merge pull request #5719 from vector-im/feature/bma/improved_logs
...
Do not cancel the current sync request when the app goes to background
2022-04-12 09:23:24 +02:00
ganfra
f7e8c01121
Merge pull request #5554 from SpiritCroc/endless-loading
...
Fix endless loading timeline due to conflicting chunks
2022-04-11 18:52:24 +02:00
Onuray Sahin
5f635de0ac
Merge pull request #5711 from vector-im/feature/ons/live_location_aggregation
...
Live Location Sharing - Attach location data to beacon info state event
2022-04-11 15:01:59 +03:00
Onuray Sahin
1c5cf6b29e
Code review fixes.
2022-04-11 13:14:42 +03:00
SpiritCroc
902d2f7338
TokenChunkEventPersistor: move link fixing to its own method
2022-04-11 12:09:07 +02:00
Benoit Marty
03d6aa8cd3
Do not cancel current sync request when going to background #5621
...
Incremental sync can be long and it requires the user to wait for the treatment to end, else all is restarted from the beginning each time the user moves the app to foreground.
2022-04-08 16:01:04 +02:00
Onuray Sahin
28f483870f
Code review fixes.
2022-04-08 13:26:36 +03:00
Onuray Sahin
15e1c7bc37
Code review fixes.
2022-04-08 13:18:17 +03:00
SpiritCroc
e4c0883312
Rageshake: add field about what debug settings to expect
...
Change-Id: Idd9a1954e80c24ed58bf8e1f2b93ecb7cd211407
2022-04-07 15:15:29 +02:00
ganfra
72bd398ae0
Merge pull request #5481 from SpiritCroc/readmarkerupdate
...
Fix updating unread marker if not to latest chunk
2022-04-07 10:23:58 +02:00
Benoit Marty
dbf10a222f
Privacy: does not log reaction (it is a `v`log, so not critical)
2022-04-07 10:15:21 +02:00
Benoit Marty
d4add052d9
This log was quite useless
2022-04-07 09:30:42 +02:00
Onuray Sahin
6708ed8b34
Lint fixes.
2022-04-06 19:02:50 +03:00
Onuray Sahin
faa07513ec
Update last location content of beacon info state event.
2022-04-06 19:01:25 +03:00
ganfra
94099f4908
Merge pull request #5659 from SpiritCroc/permalink-failure
...
Fix endless loading timeline if opened at non-existing event
2022-04-06 17:57:48 +02:00
Onuray Sahin
197b542030
Check if live location data is valid.
2022-04-06 17:31:56 +03:00
Benoit Marty
c276d6ae74
Merge pull request #5707 from vector-im/feature/aris/threads_prune_deleted_events
...
Prune the content of deleted events completely
2022-04-06 15:53:21 +02:00
Onuray Sahin
aae281a7ea
Support aggregation of live location beacon events.
2022-04-06 16:34:30 +03:00
Benoit Marty
9c1cdf6488
Merge pull request #5703 from vector-im/feature/bma/avoid_error_log
...
Feature/bma/avoid error log
2022-04-06 15:08:20 +02:00
ariskotsomitopoulos
9d41508530
Prune the content of deleted events completely
2022-04-06 15:48:54 +03:00
Onuray Sahin
2a42eb8c87
Merge pull request #5697 from vector-im/feature/ons/live_location_pulse
...
Live Location Sharing - Send location data
2022-04-06 15:35:02 +03:00
Benoit Marty
7e8c7f32fb
Fix long line. It's OK to log the whole data class (same log than previous)
2022-04-06 14:33:06 +02:00
Benoit Marty
26e80ba70b
KeysBackup: Better handling of 404 to avoid error log
2022-04-06 12:38:52 +02:00
Benoit Marty
785ccc8bc4
Format file
2022-04-06 11:18:45 +02:00
Benoit Marty
e8f421fe34
Create Event.isLocationMessage()
2022-04-06 11:17:55 +02:00
Benoit Marty
e27dcbc9b9
Create Event.getMsgType() extension
2022-04-06 11:15:01 +02:00
Benoit Marty
0f14652932
Merge pull request #5692 from vector-im/feature/aris/threads_beta_infrom_users_on_reply
...
Threads Beta opt-in mechanism
2022-04-05 20:40:16 +02:00
ariskotsomitopoulos
37dc77cc3e
Add isValid check to RealmChangeListener to prevent crashes on deleted objects
2022-04-05 20:36:33 +03:00
Onuray Sahin
c26c9ff1cc
Send live location data.
2022-04-05 12:49:12 +03:00
Onuray Sahin
48d40d8ba2
Merge pull request #5651 from vector-im/feature/ons/live_location_beacon_info
...
Live Location Sharing - Beacon Info
2022-04-04 12:55:22 +03:00
Onuray Sahin
273b4816db
Fix lint error.
2022-04-04 12:03:43 +03:00
SpiritCroc
1287770b16
Add some optional ViewPager debugging
...
Change-Id: I30332b57779e1093d06d2d7a07bca0ca5342de15
2022-04-03 13:29:16 +02:00
Adam Brown
57bf044df0
adding documentation to the new session listener
2022-04-01 16:57:23 +01:00
Onuray Sahin
97de6de8f2
Code review fixes.
2022-04-01 17:04:52 +03:00
Onuray Sahin
922d68cfda
Code review fixes, use unstable prefixes as MSCs suggest.
2022-04-01 15:01:25 +03:00
Adam Brown
eb72587238
removing unused import
2022-03-31 17:23:05 +01:00
Adam Brown
ced621d469
refreshing the room summaries when new crypto sessions are recieved
...
- matches the same flow as the timeline by starting observing in the ViewModel init
2022-03-31 17:23:05 +01:00
Adam Brown
4629353314
removing noop newSession from base decryption interface, it's only relevant for Megolm sessions
2022-03-31 17:13:31 +01:00
Aris Kotsomitopoulos
3c06d56b87
Merge pull request #5627 from vector-im/feature/aris/threads_summary_event_redaction
...
Thread redaction will now update the thread summary counter
2022-03-31 16:21:35 +03:00
Benoit Marty
9a2cc1a4c5
Merge pull request #5664 from vector-im/feature/bma/dep_upgrade
...
Upgrade Jitsi and ktlint
2022-03-31 11:32:14 +02:00
SpiritCroc
f50b21d9b7
Do not clear unread counts when fetching room members
...
This messes with our "open without reading" functionality.
Change-Id: Ie1bf84aa79b3bc0c18efd7325f817aa227b8e748
2022-03-31 08:37:40 +02:00
SpiritCroc
972fd9f31a
Also give up loading event for M_FORBIDDEN
...
Change-Id: Ic21821df4a341257dca99149141855a34edc5101
2022-03-30 17:41:08 +02:00
SpiritCroc
c44c637fba
Also give up loading event for M_FORBIDDEN
2022-03-30 17:35:51 +02:00
SpiritCroc
d5d555d07f
Merge tag 'v1.4.8' into merge-v1.4.8
...
Change-Id: Ic6338fef4f27ca95016eb11ab07a10d3f3a8986e
Conflicts:
library/ui-styles/src/main/res/values/dimens.xml
library/ui-styles/src/main/res/values/styles_buttons.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.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/session/room/summary/RoomSummaryUpdater.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.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/timeline/action/MessageActionsViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt
vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
vector/src/main/res/drawable/ic_home_bottom_catchup.xml
vector/src/main/res/drawable/ic_shield_custom.xml
vector/src/main/res/drawable/ic_shield_trusted.xml
vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
vector/src/main/res/layout/fragment_ftue_account_created.xml
vector/src/main/res/layout/fragment_timeline.xml
vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
vector/src/main/res/layout/view_attachment_type_selector.xml
vector/src/main/res/layout/view_room_detail_toolbar.xml
vector/src/main/res/menu/menu_submit.xml
2022-03-30 15:53:51 +02:00
ariskotsomitopoulos
f58f3ad6d9
Refactoring
2022-03-29 14:28:57 +03:00
SpiritCroc
39c5cb2280
Load timeline without initial eventId if not found
...
Change-Id: Ifab011c7730ddd9eeeef89451dda48b3fcec341b
2022-03-29 13:08:49 +02:00
SpiritCroc
365c03e763
Load timeline without initial eventId if not found
2022-03-29 12:56:54 +02:00
Adam Brown
1b2e3502cb
Merge pull request #5628 from vector-im/feature/adm/direct-login-tests
...
Direct login tests
2022-03-29 11:44:11 +01:00
ariskotsomitopoulos
2938fa92c0
Rename countThreads method
2022-03-29 11:58:11 +03:00
Onuray Sahin
2a4182ea84
Code review fixes.
2022-03-29 11:53:44 +03:00
David Langley
b4885629af
Keep live event/pagination listeners.
2022-03-28 17:23:05 +01:00
Benoit Marty
ff1fb63bf6
Fix some ktlint issues, ignore some others
2022-03-28 18:22:04 +02:00
Onuray Sahin
152c921017
Send beacon info.
2022-03-28 16:23:51 +03:00
Onuray Sahin
32cf3feab8
Create beacon content class.
2022-03-28 14:45:40 +03:00
ClaireG
a9b87de7a3
[Subscribing] Blank display name
2022-03-28 10:34:22 +02:00
David Langley
f38bf2548f
lint
2022-03-25 23:18:45 +00:00
David Langley
7e930472e8
Align with web implementation
2022-03-25 22:51:34 +00:00
Adam Brown
230c37597c
adding happy path tests for the direct login use case
2022-03-25 11:15:05 +00:00
Eric Decanini
10974366fb
Merge pull request #5473 from vector-im/bugfix/eric/voting-ended-poll
...
Fixes ended poll voting
2022-03-24 20:23:38 +01:00
ganfra
3410e75790
Merge tag '1.4.7' into develop
2022-03-24 19:34:14 +01:00
ganfra
04b136e3e4
RoomList: more fixes on count
2022-03-24 18:50:33 +01:00
ganfra
745382cdfa
RoomList : avoid using flow extension on realm results (leads to frozen object and leaks).
2022-03-24 15:41:42 +01:00
ariskotsomitopoulos
3c7495bd60
Thread redaction will now update the thread summary counter
...
Root threads with 0 threads replies will become normal messages and removed from thread summaries
2022-03-24 16:28:49 +02:00
ericdecanini
edfe81cc2b
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-24 14:40:28 +01:00
Adam Brown
e7a1c20132
handling the username in use as a username field error
2022-03-23 17:29:06 +00:00
Adam Brown
5aa35899bc
extracting error cases to extensions and handles invalid username as a specific case
2022-03-23 17:29:06 +00:00
Adam Brown
373385b29f
moving the not accepting registration error handling to the login fragment
2022-03-23 17:29:06 +00:00
Benoit Marty
012cdf4b4d
runBlocking -> runTest
...
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
2022-03-22 16:52:18 +01:00
Benoit Marty
86829008c3
runBlockingTest -> runTest
...
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
2022-03-22 16:39:39 +01:00
Benoit Marty
03fee2a131
The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0
...
https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
2022-03-22 16:14:15 +01:00
Benoit Marty
7502158ba9
Fix compilation warning (exhaustive when)
2022-03-22 16:13:06 +01:00
ganfra
073475854e
Merge pull request #5564 from SpiritCroc/timeline-chunk-double-linking
...
Fix another case of read markers not updating: Ensure proper double linking of TimelineChunks
2022-03-22 15:46:48 +01:00
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
SpiritCroc
6878a973ed
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.
2022-03-18 08:07:56 +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
SpiritCroc
682f4c35d2
Fix endless loading timeline due to conflicting chunks
2022-03-16 14:24:31 +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