72a7e0677e
Merge tag 'v1.3.6' into sc
...
Change-Id: I6fb1ef7b45ef67915a8d5bd17bf36cab90e9bf02
2021-10-27 15:25:05 +02:00
042e91ee1c
Set version to 1.3.6
2021-10-26 18:28:47 +02:00
3d238d52d9
Fix broken video compression
...
Library issue: https://github.com/natario1/Transcoder/issues/154
Change-Id: I4491e7e3fc541922ddc0fd3e407d608cd46a23f0
2021-10-26 13:02:38 +02:00
8171a85657
Merge remote-tracking branch 'upstream/develop' into sc
...
Change-Id: Ia092f493aa3e3ad509eb7876e19fc773b40cc233
2021-10-22 11:16:40 +02:00
923c80125e
Add setting to put DM in spaces based on user memberships
...
Change-Id: If202f640b2061423167cc8fc205781ab48ea4793
2021-10-22 11:09:06 +02:00
a6f809c613
Refactor SC SDK preferences
...
- Fix message preview setting
- Fixes some issue with chats being marked as unread
- Prepare for more SDK preferences
Change-Id: I7522624175c00ddf32c1bbec2a985ff34eb8d317
2021-10-22 10:50:20 +02:00
c1b1d855d4
Don't put DM in spaces based on user memberships
...
Change-Id: I0dcd369a76f86e86d8d194db3ba133fae615a45a
2021-10-22 09:21:51 +02:00
978056e01f
Merge tag 'v1.3.4' into sc
...
Conflicts:
dependencies.gradle
gradle.properties
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/session/sync/parsing/RoomSyncAccountDataHandler.kt
vector/build.gradle
vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.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/HomeActivity.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/home/room/detail/timeline/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
Parts of conflict resolution taken from
commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
Merge: 06f52832b 1f74bc986
2021-10-21 17:31:11 +02:00
7c9c4ecf5f
Version++
2021-10-20 10:49:40 +02:00
85983562fa
No need to add explicit dependencies on stdlib, this is added by the gradle plugin since 1.4
...
https://kotlinlang.org/docs/whatsnew14.html#dependency-on-the-standard-library-added-by-default
2021-10-19 19:06:27 +02:00
097694f6ef
Make MegolmBackupAuthData.signatures optional for robustness
2021-10-19 17:31:51 +02:00
ab0e707ea6
Merge pull request #4229 from vector-im/feature/adm/decrypt-event-dummy-keys-fallback-crash
...
Catching EnsureOlmSessionsForDevicesAction errors
2021-10-19 16:13:34 +02:00
aea22201c3
Feature/aris/issue 465 scrub exif data ( #4248 )
...
Implement ImageExifTagRemover to scrub user sensitive data while sending original size photos
- Return a not scrubbed file when there is an exception while scrubbing the jpeg file
- Improve error handling on image compression
2021-10-18 21:20:03 +00:00
c8a8d2e0bf
applying a retry when attempting to fetch one time keys, tries to catch flaky network conditions
2021-10-18 16:15:07 +01:00
ca79e87e00
applying a retry when attempting to send dummy payload to device
2021-10-18 16:13:22 +01:00
085da6c99a
Merge pull request #4090 from vector-im/feature/aris/presence
...
Feature/aris/presence
2021-10-13 09:58:22 +02:00
7be7d50575
Bump libphonenumber from 8.12.34 to 8.12.35
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.34 to 8.12.35.
- [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.34...v8.12.35 )
---
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-10-12 23:10:59 +00:00
13ec4db8a2
Merge pull request #4215 from vector-im/feature/ons/fix_voice_message_resend
...
Voice message - Do not delete file to be able to resend
2021-10-12 18:30:03 +02:00
256cb7093d
catching ensureOlmSessionsForDevicesAction errors during the event decryption flow
...
- we currently can't do much but log here as we've asynchronously start the fallback flow, catching the error at least stops a hard crash
2021-10-12 16:37:40 +01:00
6c915ea4d1
Cleanup the PR about presence
2021-10-12 16:45:41 +02:00
923bc00dcd
Merge branch 'develop' into feature/aris/presence
2021-10-12 15:22:40 +02:00
7338982030
Merge pull request #4193 from vector-im/feature/bma/fix_logout_crash
...
Try to fix #4007
2021-10-12 15:19:20 +02:00
36d2f8e46b
Merge pull request #4228 from vector-im/feature/adm/suspending_add_pusher
...
Improved /settings/notifications push toggle error handling
2021-10-12 14:50:01 +02:00
a7ec76bae3
Also call monarchyWriteAsyncExecutor.awaitTermination
2021-10-12 14:20:20 +02:00
e3034e5d11
Merge pull request #4190 from vector-im/feature/fga/mavericks_2
...
Feature/fga/mavericks 2
2021-10-12 14:11:00 +02:00
786dec5dc0
observing both the email pushers and email pids so that displayed email pushers are always in sync
2021-10-12 12:49:39 +01:00
a24a9b43fa
Mavericks 2: make the UT happy. Let SDK exposes MatrixCoroutineDispatchers.
2021-10-12 13:47:32 +02:00
bdec6a3580
removing mention of email in the http pusher model, we have dedicated emails functions on the service instead
2021-10-12 11:39:14 +01:00
13f8494072
grouping with other test deps and commenting the reason for rxKotlin dependency
2021-10-12 11:39:14 +01:00
69bb554e20
lifting the request executor to its own file in the network package
...
- also creates a dedicated RequestModule instead of providing the executor via the pushers module
2021-10-12 11:39:14 +01:00
aff787bb29
extracting the test fakes to their own package
2021-10-12 11:39:14 +01:00
8e84aea434
removing unused import
2021-10-12 11:39:14 +01:00
b7c911feee
adding test cases for when adding a pusher fails and when it already exists
2021-10-12 11:39:14 +01:00
21479b2b28
inverting if to favour positive ordering
2021-10-12 11:39:14 +01:00
48d9dfb82d
adding test for the add pusher task happy flow
...
- introduces the concepts of Fakes for handling the dependencies, unforuntately realm/monarchy aren't very testable in their current state so we'll need to use mocks
2021-10-12 11:39:14 +01:00
ced85964da
including rx java dependency for the sdk tests because real (monarchy) tranisitive depends on rx but doesn't propagate it as an API dependency
...
- without an explicit declaration we can't mock the realm instance
2021-10-12 11:39:14 +01:00
0a2d7d709b
creating an injectable request executor to enable unit tests network request (without hitting the network)
2021-10-12 11:39:14 +01:00
6672ab3966
removing comment which doesn't add additional context/information
2021-10-12 11:39:14 +01:00
46c338934e
running lint
2021-10-12 11:39:14 +01:00
e24329e139
reusing the transactional logic for the current session notifications toggle
...
- uses the synchronous token registering which also means we get error handling
2021-10-12 11:39:14 +01:00
6c9fcc0d93
extracting the add pusher logic for the worker and delegating to the task from the worker
2021-10-12 11:39:14 +01:00
2d97640372
Ensure no async transaction will occurs if the store is closed
2021-10-12 12:08:14 +02:00
4a7e0a5d95
CleanupSession: start by releasing the session, then empty the databases
2021-10-12 11:57:07 +02:00
73c08e2eeb
Avoid code duplication
2021-10-12 11:38:16 +02:00
0d85299c57
Try to fix #4007
...
Wait for Realm instance to be effectively closed before deleting Realm files
2021-10-12 10:40:46 +02:00
13aee7d162
Do not delete voice message file to be able to resend.
2021-10-11 16:49:15 +03:00
57a9ea4617
Merge tag 'v1.3.3' into sc
...
Change-Id: Ie2c7157dba2c23916e99669ee5c3705c2f6cea30
2021-10-11 12:42:06 +02:00
343783f807
Version++
2021-10-11 12:06:51 +02:00
dffc0c1d65
Merge tag 'v1.3.2' into sc
...
Change-Id: I7faf88b02994b10027bbbd00b7ac565a94381cc5
Conflicts:
.gitignore
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.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/TokenChunkEventPersistor.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/TextComposerView.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.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/filtered/FilteredRoomFooterItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
2021-10-11 09:55:26 +02:00
3a387c5e32
version++
2021-10-08 16:36:48 +02:00
SpiritCroc
Benoit Marty
Benoit Marty
Aris Kotsomitopoulos
Adam Brown
dependabot[bot]
ganfra
Onuray Sahin