Commit graph

4979 commits

Author SHA1 Message Date
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
Damir Jelić
ee017b7302 rust: Bump the sdk version
This updates the rust-sdk to support fallback keys, note that fallback
keys are not yet uploaded, they just can be used when downloaded and
info about the fallback keys coming from a sync can be passed to the
rust side.
2021-12-09 13:15:54 +01: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