Commit Graph

3950 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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