Commit Graph

3767 Commits

Author SHA1 Message Date
SpiritCroc 38ae03893f Merge tag 'v1.3.1' into sc
Change-Id: I1e5589c78e3398867519b1dbd326581cbe60baea

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/drawable/ic_jump_to_unread.xml
	vector/src/main/res/drawable/ic_radio_on.xml
	vector/src/main/res/drawable/ic_voice_message_locked.xml
	vector/src/main/res/drawable/ic_voice_mic_recording.xml
2021-09-30 09:27:15 +02:00
SpiritCroc 0c7981dc26 Revert "Revert "Revert "Use Java 11 source code"""
This reverts commit 23afa02cad957e4426cc7fc872910c6f0b556cb5.

Change-Id: I0dc76749a7084473a5c15e84032f0ba5058cac72

Conflicts:
	attachment-viewer/build.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android-rx/build.gradle
	matrix-sdk-android/build.gradle
	vector/build.gradle
2021-09-29 09:56:32 +02:00
SpiritCroc 4f93eb041c Merge tag 'v1.3.0' into sc
Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68

Conflicts:
	gradle.properties
	vector/build.gradle
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
	vector/src/main/res/layout/reaction_button.xml
2021-09-29 09:55:02 +02:00
SpiritCroc b51bd743c7 Revert "Revert "Use Java 11 source code""
This will make the latest upstream merge easier.

This reverts commit 302b2865264ec94471c59041ce8efdc45d3764f4.
2021-09-29 09:13:59 +02:00
Benoit Marty 465b8bfe05 Version++ 2021-09-27 13:11:15 +02:00
SpiritCroc 45c6a4e9ba Restore old hasUnread detection algorithm to include notices
Change-Id: Ib934a381cad1fec18815e222d61350240ba9d93f
2021-09-25 17:16:53 +02:00
Benoit Marty 045e4bbf76
Merge pull request #4052 from vector-im/feature/adm/email_notification_toggle
Add email notification toggle
2021-09-24 20:42:44 +02:00
Valere 1fed27961a Code review 2021-09-24 19:35:49 +02:00
Valere 0acf90d8cd Code review 2021-09-24 18:12:12 +02:00
Valere d59aaa7611 Support entering mail in user invite screen 2021-09-24 18:12:12 +02:00
Adam Brown 4482cbdaa6 using dedicated pusher removal methods for the different types of pushers
- also adds a separate removePusher which supports removing any type of pusher
2021-09-24 17:00:48 +01:00
Adam Brown 95b4f99970 making the add email pusher append parameter configurable by clients, typically we wouldn't want to overwrite other accounts but we can expose the option to clients if they want that behaviour 2021-09-24 15:39:08 +01:00
SpiritCroc 3563e76432 Update local unreadCount when marking chat as read
Change-Id: I12718de30fb36b701fe4d5e63ccae96e13b9e34c
2021-09-24 15:51:49 +02:00
Benoit Marty 1b262a4df8
Merge pull request #4071 from vector-im/tools/adm/connected_tests
Fixing no tests found when running vector:connectedAndroidTest
2021-09-24 09:53:04 +02:00
Adam Brown 7bd8890276 extracting orchestrator dependency to the dependencies.gradle file 2021-09-23 20:24:16 +01:00
Benoit Marty ed03d2d278
Merge pull request #4021 from vector-im/dependabot/gradle/com.otaliastudios-transcoder-0.10.4
Bump transcoder from 0.10.3 to 0.10.4
2021-09-23 19:40:26 +02:00
Benoit Marty f3c4e9a1df ktlint 2021-09-23 19:33:38 +02:00
Benoit Marty 80aad8a958
Merge pull request #4033 from vector-im/feature/bca/improve_store_key_throttling
Use in memory cache when adding inBoundGroupSession
2021-09-23 19:31:35 +02:00
SpiritCroc 586f565c23 Properly hide unread counts if not supported by homeserver
Showing a "1" for every unread chat doesn't make too much sense.

Change-Id: I8e49f2bf20477f9b58039005c411041269ca6652
2021-09-23 18:13:15 +02:00
Adam Brown 0302d19f47 formatting 2021-09-23 13:20:01 +01:00
Benoit Marty 75fb026289 Rename some classes after new feature implemented 2021-09-23 13:54:03 +02:00
Benoit Marty 306e3cf055 Improve log to track push and sync request
Also change some log level from d to v
2021-09-23 13:54:03 +02:00
Benoit Marty 05aff3314d Add error state 2021-09-23 13:54:03 +02:00
Benoit Marty f5151463e2 Add the number of rooms and toDevice events in the debug data 2021-09-23 13:54:03 +02:00
Benoit Marty 63a84dcb8a Add incremental sync status to the room list and the room detail (only in developer mode) 2021-09-23 13:54:03 +02:00
Adam Brown d31ad7e187 extracting constants for the pusher kinds and email appId 2021-09-23 12:33:48 +01:00
Adam Brown 8316728e53 removing this. usages where there's no clashes 2021-09-23 11:45:09 +01:00
dependabot[bot] 013b16a37d
Bump transcoder from 0.10.3 to 0.10.4
Bumps [transcoder](https://github.com/natario1/Transcoder) from 0.10.3 to 0.10.4.
- [Release notes](https://github.com/natario1/Transcoder/releases)
- [Commits](https://github.com/natario1/Transcoder/compare/v0.10.3...v0.10.4)

---
updated-dependencies:
- dependency-name: com.otaliastudios:transcoder
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-23 08:46:12 +00:00
dependabot[bot] 654010570e
Bump libphonenumber from 8.12.32 to 8.12.33
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.32 to 8.12.33.
- [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.32...v8.12.33)

---
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-09-22 23:05:09 +00:00
SpiritCroc e1546cec06 Fix wrong notification count calculation
Change-Id: Ia136933c3afe60a99362076566b6a5991f4a1ac7
2021-09-22 22:31:27 +02:00
SpiritCroc 8d267649eb Setting to count unread rooms instead of messages in aggregates
Change-Id: I557741771ba8b83cc2ce7bb6c90501ebc14a7736
2021-09-22 19:41:25 +02:00
SpiritCroc cc13146f81 Update unread counter handling
Change-Id: I2f5738b822b4161d18de28074385c5664f3d1f98
2021-09-22 17:50:24 +02:00
SpiritCroc 45746dfbbf Use MSC 2654 server-reported unread counts
Change-Id: I6569f9c07c109bcb17dab48ad7f32480a22efb54
2021-09-22 16:55:46 +02:00
Adam Brown 8734d5d2e7 removing redundant comments about pusher kind from apis which don't have a kind field 2021-09-21 16:08:46 +01:00
Adam Brown 2c25efc36a making the removePusher more generic as it can handle email and http pushers
- Updates the doc to reflect that to remove emails an appId of m.email is required
2021-09-21 13:46:18 +01:00
Adam Brown 78d70eab12 enforcing emails pushes to always be appended
- always appending allows the same email to be used for other accounts see https://github.com/matrix-org/matrix-react-sdk/pull/2727 https://github.com/matrix-org/matrix-react-sdk/pull/2727/files#diff-ec232520bf51337e5e6939b885d21f428ad6da3306c8e17a3ff660b2b341179dR165
2021-09-21 11:32:33 +01:00
Adam Brown 516bb6ed95 lifting the email branding to its own parameter so clients of the sdk can configure it 2021-09-21 11:26:11 +01:00
Adam Brown ee3f2877e9 adding matrix SDK support for email adding and removing email pushes
- email pushes make use of a new undocumented `brand` field, for now this field maps directly to the app display name so we can resuse it
2021-09-21 09:52:00 +01:00
SpiritCroc 756529e565 Revert "Use Java 11 source code"
This seems to break device compatibility with a ZTE Blade L3, Android
5.0.2, stock ROM - even though the Google Play Developer Console views
the device as supported.

Not sure how long we want to stick to Java 8, but we should at least
give everyone who had v1.2.0 installed the chance to get to v1.2.2, to
get a version with the recent security vulerability fix.

This reverts commit 80f23f1f3c.

Change-Id: If599d9154e9385a33f10b6df17469cd86deccb7b
2021-09-18 20:26:29 +02:00
Benoit Marty b5f7351564
Merge pull request #4008 from vector-im/feature/fga/small_timeline_optimisation
Feature/fga/small timeline optimisation
2021-09-17 18:06:58 +02:00
Benoit Marty 744523b200
Merge pull request #4017 from vector-im/feature/aris/optimize_global_gradle_variables
Optimize dependencies handling
2021-09-17 15:28:49 +02:00
ariskotsomitopoulos 1dcf6b9539 Enhance dependencies handling to support Dependabot 2021-09-17 14:58:44 +03:00
Valere 22319a0f0a Cleaning, line too long 2021-09-16 09:33:06 +02:00
Valere e5de62b57c Code review 2021-09-16 09:33:06 +02:00
Valere 94f88c80fc Fix parent relation handling 2021-09-16 09:33:06 +02:00
ariskotsomitopoulos 87fefdc7bb Add more dependencies to common dependencies.gradle 2021-09-15 20:22:52 +03:00
Valere 70ebb3a3f2 Code review 2021-09-15 18:48:40 +02:00
Valere 2c1435f08c Change default power to invite in private space + setting 2021-09-15 18:47:38 +02:00
Benoit Marty d6b261ce4c
Merge pull request #3986 from vector-im/feature/bca/room_summary_api
Better room preview, use room Summary API if available
2021-09-15 15:03:31 +02:00
ariskotsomitopoulos c89b2c0536 Optimize dependencies handling 2021-09-15 13:21:25 +03:00