Commit Graph

4274 Commits

Author SHA1 Message Date
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 f6067977fe Refactor ThreadMessagingTest 2022-01-17 14:27:30 +02:00
ariskotsomitopoulos b343739a71 Enhance decrypted thread summary to return poll questions 2022-01-17 14:27:17 +02:00
ariskotsomitopoulos 5b786e5749 Remove duplicate RetryTestRule 2022-01-17 14:26:39 +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 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
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
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
Benoit Marty 8038d40195 Prepare for hotfix release 1.3.14 2022-01-12 12:28:16 +01: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
dependabot[bot] 1951130c43
Bump libphonenumber from 8.12.40 to 8.12.41
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.40 to 8.12.41.
- [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.40...v8.12.41)

---
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-01-11 23:07:26 +00:00
Benoit Marty 848a7f4062 Version++
Also add comment about the new versioning strategy
2022-01-11 17:44:04 +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
ariskotsomitopoulos 8adeab0ddd - fix lint error 2022-01-11 16:14:26 +02: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 7581a0b549 Fix test compilation 2022-01-10 18:36:04 +01: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
Benoit Marty ae8d1d1429 Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10 2022-01-10 15:10:08 +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 0fb26da355 PR Remarks 2022-01-10 11:26:03 +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
ariskotsomitopoulos 50e51cbe29 Merge branch 'develop' into feature/aris/threads 2022-01-07 16:36:48 +02:00
ariskotsomitopoulos ae81f61958 fix integration test 2022-01-07 16:28:58 +02:00
Benoit Marty 37f0ffab8b Fix test compilation issue 2022-01-07 14:46:40 +01:00
Benoit Marty d14dadde27
Merge branch 'develop' into feature/dla/fix_reply_and_quote_newlines 2022-01-07 14:43:41 +01:00
Benoit Marty bcebfff1a2
Merge pull request #4864 from vector-im/feature/aris/linter_github_actions_improvement
Enhance Linter Github Actions Reporting
2022-01-07 14:25:29 +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
ariskotsomitopoulos 41bf1ccc07 Remove adb timeout 2022-01-07 11:03:54 +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
ariskotsomitopoulos abf8932747 fix typo 2022-01-06 12:25:19 +02:00
ariskotsomitopoulos 33a4eac7d2 - Fix github actions ktlint reports
- Publish results on PR via commenting
- Support for all modules along with tests
- Code format & emoticons
2022-01-06 00:26:47 +02:00
ariskotsomitopoulos 261030f51e - Fix integration tests (still not perfect while github actions are very very limited for that)
- Split them in msdk and app test along with multiple smaller steps.
- Mark the not working tests with @Ignore so that they will not run neither local or on github actions
- Add user friendly comment on PR to view the results
2022-01-05 23:42:57 +02: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
ariskotsomitopoulos 84c537315c Github actions test 2022-01-04 00:38:50 +02:00
ariskotsomitopoulos ef2c32e2c9 Github actions test 2022-01-04 00:32:39 +02:00
ariskotsomitopoulos 925c1671a6 Add more integrations tests for threads 2022-01-03 21:09:36 +02:00
ariskotsomitopoulos 3ef960c4c3 Update copyright 2022-01-03 19:45:48 +02:00
ariskotsomitopoulos 929cc29f77 Update copyright 2022-01-03 19:18:51 +02: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
ariskotsomitopoulos e482ef4262 First local thread integration test 2022-01-03 16:51:12 +02: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 c2183800d3 Github actions improvement test 2022-01-03 12:14:14 +02: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 6a73c9315a
Merge pull request #4809 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.40
Bump libphonenumber from 8.12.39 to 8.12.40
2021-12-30 10:30:27 +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
Onuray Sahin 46c7c7421e Merge branch 'develop' into feature/ons/static_location
* develop: (87 commits)
  Update versions to 1.3.13
  Release: prepare CHANGES
  adding changelog entry
  removing android version bypass for using text futures - the emoji span changes affect all android versions
  Update versions to 1.3.12
  Release: prepare CHANGES
  removing trailing space
  extracting the emoji processing to an interface so that we can override the behaviour in the unit test
  adding comment to explain SpannableStringBuilder usage
  adding changelog entry
  using the safe emoji processor to avoid the timeline failing when processing the content and the emoji library hasn't initialised yet
  Update changelog.d/4743.bugfix
  Small UI fix in room member profile hearder (#4700)
  Add changelog
  adding changelog entry
  adding missing binding options emote content - fixes android 12+ crash when certain emojis are used within the emote content
  Fix crash ImmutableModelException
  Update Gradle Wrapper from 7.3.1 to 7.3.2.
  Call banner: center text vertically
  adding changelog entry
  ...
2021-12-27 14:27:19 +03: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
dependabot[bot] 863b201793
Bump libphonenumber from 8.12.39 to 8.12.40
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.39 to 8.12.40.
- [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.39...v8.12.40)

---
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>
2021-12-23 23:07:37 +00: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 7048080ee0 Merge branch 'develop' into feature/aris/threads 2021-12-21 13:24:03 +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
ganfra 55c0f1fcb3 Update versions to 1.3.13 2021-12-20 15:35:09 +01:00
ganfra c6a118fc1f Update versions to 1.3.12 2021-12-17 19:05:17 +01: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
Benoit Marty fa65cc59fe Version++ 2021-12-14 14:46:08 +01:00
ariskotsomitopoulos 5ceed4096e Fix threads sort order, newest first 2021-12-14 15:44:38 +02:00
ariskotsomitopoulos d56281dca7 - Enhance local notification to work with read receipt & the latest chunk
- Local notification mentioning system
- Fix/Improve thread list filtering
2021-12-14 13:35:08 +02:00
Benoit Marty fa060051ed
Merge pull request #3970 from vector-im/feature/ons/fallback_keys
Fallback keys implementation
2021-12-13 23:36:20 +01:00
Onuray Sahin f028f9836b Merge branch 'develop' into feature/ons/poll_timeline
* develop: (49 commits)
  Update changelog.d/4592.bugfix
  Remove jcenter from here, let's see what the CI will say
  Common struct for each maven repo
  Rename the file to group them
  Add changelog file
  Revert PR 4592 for devtools
  Enhance include groups implementation by decoupling them to a separate file
  Cleanup
  Legals: improve API to get homeserver terms
  Legals: update setting icon
  Auto-review
  Add a help section in the settings.
  Changelog
  Color for links
  Use same height than the loading item to avoid dynamic resizing
  Legals: only display external URLs.
  Legals: Move the 2 copyrights items to the new legal screen
  Add some space between the 2 TextViews, and improve the layout
  Legals: Move the 3 element links to the new legal screen
  Rename some classes
  ...

# Conflicts:
#	vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
#	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
2021-12-13 17:44:21 +03:00
Valere 76960f8b67
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
Co-authored-by: poljar <poljar@termina.org.uk>
2021-12-10 16:12:14 +01:00
Valere 38a8e8b003
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
Co-authored-by: poljar <poljar@termina.org.uk>
2021-12-10 16:11:58 +01:00
Onuray Sahin 9b2a3cf445 Code review fixes. 2021-12-10 17:57:57 +03:00
Benoit Marty bf7907a119 Legals: improve API to get homeserver terms 2021-12-10 15:35:46 +01:00
Benoit Marty 411fd31d4c Legals: Trick to get the homeserver policy 2021-12-10 15:34:25 +01:00
ariskotsomitopoulos 57ef0b59ab Disable local echo for normal messages while there is a duplication 2021-12-09 20:29:13 +02:00
ariskotsomitopoulos b1d4031a76 Add/Fix local echo to threads timeline 2021-12-09 16:33:11 +02:00
Onuray Sahin be9e592aa5 Do not allow to vote the same option twice. 2021-12-09 16:08:59 +03:00
Onuray Sahin b2e599ea2b Merge branch 'develop' into feature/ons/poll_timeline
* develop: (21 commits)
  Remove automation for new Delight board
  Remove automation for old Delight board
  Bump gradle from 7.0.3 to 7.0.4
  Bump realm-gradle-plugin from 10.8.1 to 10.9.0
  Bump libphonenumber from 8.12.38 to 8.12.39
  Bump mavericks from 2.4.0 to 2.5.0
  removing no longer possible branches
  adding a consistent padding to allow message types to avoid touching the side gutter
  Upgrade OLM to v3.2.7 and get it from our maven repository.
  removing manual send status spacing - it's no longer needed as the send status is always present (but invisible)
  removing manual end alignment for voice messages as send status gutter is now always present
  forcing the send spacing to always be taking into account - ensures all message lengths are consistent
  capping the preview image url based on the height - stops large screens eg tablets from attempting to fill the screen
  matching iOS max line rules for the preview description
  using themed colours for the close button
  limiting title to avoid overlapping with close icon
  flattening preview url view layout with custom view to reduce view hierarchy
  adding changelog entry
  updating url preview to match new designs
  removing now longer needed Mode argument
  ...

# Conflicts:
#	vector/src/main/res/layout/item_timeline_event_base.xml
2021-12-09 15:38:15 +03:00
Onuray Sahin 04a7590804 Code review fixes. 2021-12-09 15:09:12 +03:00
ganfra 1280687640 Merge branch 'develop' into feature/fga/timeline_chunks_rework 2021-12-09 12:36:59 +01:00
ganfra bf287d1827 Timeline: clean up 2021-12-09 12:35:23 +01:00
ganfra 1e2e9e1070 Timeline: change a bit when postPagination is triggered 2021-12-09 12:26:40 +01:00
dependabot[bot] f675dcdefd
Bump realm-gradle-plugin from 10.8.1 to 10.9.0
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.8.1 to 10.9.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.8.1...v10.9.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>
2021-12-08 23:06:34 +00:00
Valere a026137381 code review 2021-12-08 15:47:06 +01:00
Valere 01b8b7d57a Code review 2021-12-08 14:17:08 +01:00
ganfra b53433e61b Timeline: some clean up 2021-12-08 11:07:07 +01:00
ganfra bf1be4f20d Merge branch 'develop' into feature/fga/timeline_chunks_rework 2021-12-08 10:38:42 +01:00
dependabot[bot] d2969766ca
Bump libphonenumber from 8.12.38 to 8.12.39
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.38 to 8.12.39.
- [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.38...v8.12.39)

---
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>
2021-12-08 00:42:33 +00:00
ganfra 29a4fd1e41 Timeline: make 3 integration tests passing (also add some suspend method on the timeline) 2021-12-07 21:13:41 +01:00
Valere 5d35f02abb Support using unpublished fallback key instead of generating
And forgetFallback after 5mn
2021-12-07 19:56:14 +01:00
Valere f843dddc3a Cleaning 2021-12-07 19:05:36 +01:00
Valere 10671a53a4 Quick refactor to use same mechanism as updateOneTimeKeyCount 2021-12-07 19:05:36 +01:00
Onuray Sahin c603135398 Code review fixes. 2021-12-07 19:05:36 +01:00
Benoit Marty 4ac90f10c1 Fallback keys implementation.
Author: Onuray - Benoit squashes the 4 commit to cancel the addition on binaries
2021-12-07 19:05:36 +01:00
Onuray Sahin 953fadeed4 Merge branch 'develop' into feature/ons/poll_timeline
* develop: (319 commits)
  Bump dagger from 2.40.4 to 2.40.5
  More debouncing
  Changelog
  I need the view here
  clicks() already has debouncing with conflate(), so throttleFirst is not necessary
  Use debouncedClicks where applicable
  Use `observeViewEvents` facility
  private
  use != rather that is
  Fix waring for state is not dialing or connected
  state can also be connected
  Add script to compress video and convert to gif file
  removing boolean notification version usage
  adding changelog entry
  removing unused imports and increasing enum allowance
  porting the notifications setting version to the vector features
  Add warning if unexpected state.
  setting login version via typed build config field instead of resources
  separating the SSO redirection from the login activities - adds a dedicated routing activity to proxy the uri to the login selected by the feature flags
  Removing trailing space
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
#	vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
2021-12-07 18:50:52 +03:00
Benoit Marty 892d70812f Upgrade OLM to v3.2.7 and get it from our maven repository. 2021-12-07 14:50:25 +01:00
Onuray Sahin 75b544a110 Support push notification for poll creation event. 2021-12-07 12:53:35 +03:00
Benoit Marty f1d8b9e974
Merge pull request #4637 from vector-im/feature/dla/outgoing_pstn_call_fails
Feature/dla/outgoing pstn call fails
2021-12-06 21:37:11 +01:00
David Langley 747030b578 use != rather that is 2021-12-06 14:37:36 +00:00
David Langley 03be698a7e Fix waring for state is not dialing or connected 2021-12-06 13:46:56 +00:00
David Langley a6d6fd7b3b state can also be connected 2021-12-06 13:05:37 +00:00
ariskotsomitopoulos c40a686cff Implement LOCAL thread notifications that work only on real time. 2021-12-03 18:15:25 +00:00
ganfra 49eee0dc38 Merge branch 'develop' into feature/fga/timeline_chunks_rework 2021-12-03 18:39:18 +01:00
ganfra 3217277bc4 Timeline: check for create event to hide loader 2021-12-03 18:39:04 +01:00
Benoit Marty e60d053f84
Merge pull request #4568 from vector-im/feature/fga/fix_sdk_integration_tests
Feature/fga/fix sdk integration tests
2021-12-03 17:11:33 +01:00
David Langley 767ead019a Add warning if unexpected state. 2021-12-03 15:13:06 +00:00
Onuray Sahin 23ad4e5a27 Remove legacy implementation classes. 2021-12-03 16:19:19 +03:00
Benoit Marty cd7345aa6b
Removing trailing space 2021-12-03 13:54:05 +01:00
ganfra 8ca60eadbb Merge branch 'develop' into feature/fga/timeline_chunks_rework 2021-12-03 12:55:57 +01:00
ganfra 667bf1a848 Tests: fix internal TestMatrix 2021-12-03 12:55:32 +01:00
David Langley de7180ef7e And remove braces 2021-12-03 11:30:28 +00:00
David Langley 0cf50e88e9 Keep guard pattern 2021-12-03 11:28:49 +00:00
David Langley bf8b485e2c lint 2021-12-03 11:24:40 +00:00
ganfra 014da84ba6 Timeline: try to optimise a bit the loading 2021-12-03 12:14:35 +01:00
Onuray Sahin c62028df68 Implement poll actions bottom sheet. 2021-12-03 11:41:21 +03:00
Onuray Sahin 2a3a55894f Aggregate votes and poll end event. 2021-12-03 11:23:47 +03:00
Onuray Sahin a3b11b223a Allow removing poll event. 2021-12-03 11:21:52 +03:00
Onuray Sahin 7c269309c2 Allow sending vote and ending poll. 2021-12-03 11:21:21 +03:00
Onuray Sahin ebc131f492 Implement new poll content. 2021-12-03 11:18:16 +03:00
ganfra 76eddef840 Timeline: avoid notifying when decryption error is same as previous 2021-12-02 20:42:54 +01:00
ganfra 03961fe933 Timeline: update when loading states changed 2021-12-02 20:42:29 +01:00
David Langley f3b3c880d0 select answer should be used for outgoing calls. 2021-12-02 18:35:51 +00:00
dependabot[bot] 6b7f9cb688
Bump robolectric from 4.7.2 to 4.7.3
Bumps [robolectric](https://github.com/robolectric/robolectric) from 4.7.2 to 4.7.3.
- [Release notes](https://github.com/robolectric/robolectric/releases)
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.7.2...robolectric-4.7.3)

---
updated-dependencies:
- dependency-name: org.robolectric:robolectric
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-01 23:07:55 +00:00
Benoit Marty f80069604c Version++ 2021-12-01 17:03:00 +01:00
ganfra f0ecfbbab2 Tests: TestMatrix should only be used internally by sdk tests 2021-11-30 17:22:50 +01:00
ganfra 3d31ba963d Merge branch 'develop' into feature/fga/timeline_chunks_rework 2021-11-30 16:58:55 +01:00
ganfra 51f46d199f Tests: clean after review 2021-11-30 14:15:18 +01:00
Adam Brown cdb5376a19 Adding support for voice drafts
- introduces a new Voice draft and sender mode type
- initializes the voice recorder with a previously recorded file (the draft)
- renames RecordingUiStates to map to their actual UI states
2021-11-30 10:22:25 +00:00
ganfra 30fe564a2c Throw clear error when MatrixWorkerFactory is not set up on worker configuration 2021-11-29 19:26:55 +01:00
ganfra cfaa7268a8 Tests: clean up a bit 2021-11-26 18:17:28 +01:00
ganfra ccdeeeab4c Tests: fix timeline tests + some small others 2021-11-26 18:16:27 +01:00