Commit Graph

4208 Commits

Author SHA1 Message Date
SpiritCroc a9d5700d2b Merge tag 'v1.3.16' into sc
Change-Id: I8b3937f4ac30d3e72e2cb694eee2dc5bf034cb75

Conflicts:
	gradle.properties
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.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/di/NetworkModule.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.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/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/job/SyncThread.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.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/TimelineEventController.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/helper/MatrixItemColorProvider.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.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/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/res/layout/activity_call.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/values/config.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2022-01-29 12:18:19 +01:00
SpiritCroc beb2b1e8a0 [merge] Use Java 11 again
Change-Id: I3cc03216236097f4ba7b9de320fc927a603885a3
2022-01-29 10:35:54 +01: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
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
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
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 bd507a5bd2 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.

Change-Id: If3b13304668ad961abb81d5442f37a3a3a1d48b7
2022-01-20 12:20:47 +01: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
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
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
Benoit Marty b71ac4d8fa
Revert "Bump realm-gradle-plugin from 10.9.0 to 10.10.0" 2022-01-19 15:51:51 +01:00
dependabot[bot] 1e99e12857
Bump realm-gradle-plugin from 10.9.0 to 10.10.0
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.9.0 to 10.10.0.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.9.0...v10.10.0)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-18 23:08:13 +00:00
Onuray Sahin 7993ff39a5 Add missing fields to location event content. 2022-01-18 15:33:48 +03:00
Onuray Sahin 5581e0b5ba Code review fixes. 2022-01-17 18:30:04 +03: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 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
Alex Baker e3c4a9157e Force HTTP/1.1
Signed-off-by: Alex Baker <alex@beeper.com>
Change-Id: I0a71fafa883f8e15f06ceccae8edcc81ce550309
2022-01-14 11:38:36 +01: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 5095514ecd
Merge pull request #4928 from vector-im/feature/aris/stuck_local_echo_issue_516
Potential fix stuck local echo events at the bottom of the screen
2022-01-13 10:44:56 +01:00
Benoit Marty 18359fedb3 Fix #4919 2022-01-12 18:08:37 +01:00
Benoit Marty f8afe04a3b
Merge pull request #4842 from vector-im/feature/aris/integration_tests_improvement
Trying to fix integration tests
2022-01-12 17:11:16 +01:00
ariskotsomitopoulos 6f5f773360 Fix kltint errors 2022-01-12 16:45:15 +02:00
Benoit Marty c194568b08
Merge pull request #4923 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.41
Bump libphonenumber from 8.12.40 to 8.12.41
2022-01-12 14:54:34 +01:00
ariskotsomitopoulos b92cb753f9 Fix stuck local echo events at the bottom of the screen 2022-01-12 15:31:54 +02:00
Benoit Marty c1d89c5304 Version++ 2022-01-12 12:56:19 +01:00