Commit Graph

4688 Commits

Author SHA1 Message Date
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
Benoit Marty 4d49ccaf8c Configure Dokka plugin to generate Kdoc
Run `./gradlew matrix-sdk-android:dokkaHtml` to generate the Html documentation of the Matrix Android SDK
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
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
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
ariskotsomitopoulos 3eb97923cc Update Copyright 2022-04-11 15:43:32 +03:00
ariskotsomitopoulos 9414a29b80 Add Cancelled state to UIA 2022-04-11 15:38:18 +03: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
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 02401f7f3d Version++ 2022-04-05 22:37:16 +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
Adam Brown 3aac59a5ae
Merge pull request #5080 from vector-im/feature/adm/encrypted-last-message
Updating encrypted room list message previews on key updates
2022-04-01 17:48:05 +01: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
dependabot[bot] 224eb7a968
Bump libphonenumber from 8.12.45 to 8.12.46
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.45 to 8.12.46.
- [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.45...v8.12.46)

---
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-31 23:08:28 +00: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 c44c637fba Also give up loading event for M_FORBIDDEN 2022-03-30 17:35:51 +02:00
ariskotsomitopoulos f58f3ad6d9 Refactoring 2022-03-29 14:28:57 +03: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
ganfra ebee66cfaf Update versions to 1.4.10 2022-03-28 16:37:24 +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
ganfra 70e5698082 Update versions to 1.4.7 2022-03-24 15:41:35 +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
ganfra adf2c642da Update versions to 1.4.8 2022-03-23 16:27:36 +01: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
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
ariskotsomitopoulos 277619d833 Format code & add comments 2022-03-21 13:39:15 +02:00
ariskotsomitopoulos f6b38d2b49 Add runBlocking when decrypt events to avoid thread switching when accessing the realm instance (thread local) 2022-03-21 13:13:09 +02: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 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 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 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
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
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
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 6ba02629ec 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.
2022-03-11 11:27:05 +01:00
SpiritCroc 0564942b0c isReadMarkerMoreRecent(): use helper to properly compare chunks 2022-03-11 11:21:59 +01:00
Onuray Sahin 8b08d3db25 Fix poll test for users vote different options. 2022-03-11 11:36:06 +03: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
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
Onuray Sahin fd3e5128c7 Test initial poll event. 2022-03-10 14:30:03 +03:00
ericdecanini a891f59397 Replaces lateinit var with passing params 2022-03-10 12:02:25 +01:00
ariskotsomitopoulos 21111922e6 Merge branch 'develop' into feature/aris/thread_live_thread_list
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
2022-03-10 12:55:13 +02:00
ariskotsomitopoulos fd30d38603 Fix line length 2022-03-10 12:51:40 +02:00
Benoit Marty ce4ad8819a
Merge pull request #5380 from vector-im/feature/bca/crypto_fix_rolling_uisi
Refactoring for safer olm and megolm session usage
2022-03-10 11:13:07 +01:00
ariskotsomitopoulos 45ee9f85e5 Check if the server supports MSC3440 using the stable flag from /versions api 2022-03-10 12:07:05 +02:00
ariskotsomitopoulos 03f293f216 Remove io.element.thread and add stable m.thread prefix 2022-03-10 12:06:02 +02:00
Adam Brown d3fc3791bc Merge branch 'main' into develop 2022-03-09 21:33:16 +00:00
ariskotsomitopoulos 92c1bc944d Fix realm crash on v1.4.4 2022-03-09 20:03:42 +02:00
ericdecanini 2f706d6fae Replaces children state event room id with space id 2022-03-09 18:42:35 +01:00
ericdecanini f76f73f8ad Refactors DefaultSpaceService querySpaceChildren 2022-03-09 18:36:56 +01:00
SpiritCroc 6c4e404ba1 Fix updating unread marker if not to latest chunk
SetReadMarkerTask was not updating the read marker when both the old and
the new fully read eventId weren't in the last chunk, even when the new
one was after the first one.
2022-03-09 18:02:53 +01:00
Adam Brown 60bc3b09b7 updating to version 1.4.6 in prep for next release cycle 2022-03-09 16:03:00 +00:00
ericdecanini bbc6e8bbce Replaces caught Exception with HttpException 2022-03-09 16:41:18 +01:00
Benoit Marty 3f17cf595f Remove unused resources 2022-03-09 14:55:40 +01:00
Benoit Marty 7d78c8819c Ignore some other lint warnings 2022-03-09 14:40:59 +01:00
Benoit Marty cbdc28dd9b
Merge pull request #5457 from vector-im/michaelk/ignore_flaky_test
Ignore flaky VerificationTest
2022-03-09 12:18:55 +01:00
ericdecanini 047e767f34 Adds coroutinesTest to matrix sdk gradle 2022-03-09 12:18:46 +01:00
Benoit Marty 02ba09900f
Merge pull request #5434 from vector-im/feature/nfe/space_unread_count_dm
include dms number in space unread number badge
2022-03-09 11:16:07 +01:00
ericdecanini 63cd79dc4f Removes debug logs 2022-03-09 10:53:18 +01:00
Benoit Marty 20c1886fed Support both unstable and stable prefixes.
Author: Onuray
2022-03-09 10:40:43 +01:00
ericdecanini fb374b7374 Fixes wrong path parameter in getSpaceHierarchy 2022-03-09 09:57:20 +01:00
Valere 96b51744b6 Fix ktlint 2022-03-08 23:19:21 +01:00
ericdecanini 31f300c724 Adds error print stack trace 2022-03-08 21:32:13 +01:00
ericdecanini 54828f76cf Adds slash to v1 prefix path 2022-03-08 17:26:01 +01:00
ericdecanini 0892525c84 Adds debug logs 2022-03-08 17:19:11 +01:00
ericdecanini 82b5fc9557 Removes unused imports 2022-03-08 16:50:49 +01:00
ariskotsomitopoulos a53d5bdba2 Remove eventType from /relations api for threads 2022-03-08 16:41:38 +02:00
ericdecanini eb46067c08 Changes caught exception type to Throwable 2022-03-08 15:40:13 +01:00