8171a85657
Merge remote-tracking branch 'upstream/develop' into sc
...
Change-Id: Ia092f493aa3e3ad509eb7876e19fc773b40cc233
2021-10-22 11:16:40 +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
d41ff50097
Fix crash when clicking on ViewEvent source actions #4279
2021-10-21 16:34:20 +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
0a9c6673af
Bump media from 1.4.2 to 1.4.3
...
Bumps media from 1.4.2 to 1.4.3.
---
updated-dependencies:
- dependency-name: androidx.media:media
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-10-13 23:05:53 +00: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
e3034e5d11
Merge pull request #4190 from vector-im/feature/fga/mavericks_2
...
Feature/fga/mavericks 2
2021-10-12 14:11:00 +02:00
a24a9b43fa
Mavericks 2: make the UT happy. Let SDK exposes MatrixCoroutineDispatchers.
2021-10-12 13:47:32 +02:00
f89a32da1f
Add opt-in for kotlinx.coroutines annotations
2021-10-11 14:27:55 +02:00
6721669d1d
Fixes false positive "This is an internal Mavericks API. It is not intended for external use."
...
of MvRx `by viewModel()` calls. Maybe due to the inlining of code... This is a temporary fix...
2021-10-11 14:27:45 +02: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
2a29243298
Mavericks 2: clean code, but have warnings
2021-10-08 16:45:29 +02:00
3a387c5e32
version++
2021-10-08 16:36:48 +02:00
3bdf264a53
Merge develop into feature/fga/mavericks_2
2021-10-08 10:49:43 +02:00
2eec10a0c9
Increment version
...
Change-Id: I59493d232f89b6d61d442993b6a260c4d5e578b3
2021-10-08 08:49:37 +02:00
362ebcbe42
Revert "Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow"
...
This reverts commit d9b02a20d8
2021-10-07 11:11:44 +02:00
c55598a099
Bump libphonenumber from 8.12.33 to 8.12.34
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.33 to 8.12.34.
- [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.33...v8.12.34 )
---
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-06 23:07:32 +00:00
450b0bbbaf
Update UnifiedPush:android-connector to 1.2.2
2021-10-06 09:24:48 +02:00
d9b02a20d8
Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow
2021-10-05 18:57:34 +02:00
9337e0e76d
Mavericks 2: create sdk flow module
2021-10-01 15:19:48 +02:00
2324bf5d05
Mavericks 2: include the libs and make it compile
2021-09-30 19:52:37 +02:00
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
de0f44307b
Switch to own UP FCM fork for now
...
Change-Id: Ic96668ca69da62d93d360a4175e08579d58c6e67
2021-09-30 09:18:57 +02:00
d5f9d8086a
Merge pull request #4049 from vector-im/dependabot/gradle/com.arthenica-ffmpeg-kit-audio-4.5
...
Bump ffmpeg-kit-audio from 4.4.LTS to 4.5
2021-09-29 17:10:31 +02:00
31a7bfed02
version++
2021-09-29 14:56:10 +02:00
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
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
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
ae3e6a0706
Bump seismic from 1.0.2 to 1.0.3
...
Bumps [seismic](https://github.com/square/seismic ) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/square/seismic/releases )
- [Changelog](https://github.com/square/seismic/blob/master/CHANGELOG.md )
- [Commits](https://github.com/square/seismic/compare/seismic-parent-1.0.2...seismic-parent-1.0.3 )
---
updated-dependencies:
- dependency-name: com.squareup:seismic
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-28 23:06:09 +00:00
23615c0038
Merge pull request #4091 from vector-im/feature/adm/verify-exported-keys-output
...
Verify exported keys output
2021-09-28 15:14:34 +02:00
7d7ea3b9ad
Avoid multiple PRs from Dependabot when a new version of com.vanniktech:emoji* is available
...
Not updating the vesion here, dependabot will do it.
2021-09-28 11:29:52 +02:00
789cc6b597
exlcuding the slf4j logger from the test dependencies
...
the videocache dependency includes slf4j which in turn causes mockk to reflectively attempt to call real Log functions, which crashes the units tests due to the stub android.jar
2021-09-27 17:23:03 +01:00
9f93850046
Keep LTS version
2021-09-27 16:22:00 +02:00
5b5dcf988d
Version++
2021-09-27 13:09:58 +02:00
53c8862ca2
Change version to 1.3.0
2021-09-27 11:57:23 +02:00
5e7e66b18c
Bump barista from 4.1.0 to 4.2.0
...
Bumps [barista](https://github.com/AdevintaSpain/Barista ) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/AdevintaSpain/Barista/releases )
- [Commits](https://github.com/AdevintaSpain/Barista/compare/4.1.0...4.2.0 )
---
updated-dependencies:
- dependency-name: com.adevinta.android:barista
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-24 07:53:52 +00:00
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
7bd8890276
extracting orchestrator dependency to the dependencies.gradle file
2021-09-23 20:24:16 +01:00
d7bc32d7ca
including tech orchestrator in the vector module script, fixes the no tests found error
2021-09-23 17:22:19 +01:00
e4bc60d255
Merge pull request #4020 from vector-im/dependabot/gradle/androidx.media-media-1.4.2
...
Bump media from 1.4.1 to 1.4.2
2021-09-23 15:53:17 +02:00
6e010ad693
Bump ffmpeg-kit-audio from 4.4.LTS to 4.5
...
Bumps [ffmpeg-kit-audio](https://github.com/tanersener/ffmpeg-kit ) from 4.4.LTS to 4.5.
- [Release notes](https://github.com/tanersener/ffmpeg-kit/releases )
- [Commits](https://github.com/tanersener/ffmpeg-kit/compare/v4.4.LTS...v4.5 )
---
updated-dependencies:
- dependency-name: com.arthenica:ffmpeg-kit-audio
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-23 12:24:46 +00:00
93506d18fa
Display push counter on debug mode
2021-09-23 13:54:03 +02:00
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
f97549073e
Increment version
...
Change-Id: If37db85f2d3e0affd140961f9efc87c8440c5033
2021-09-18 20:38:14 +02:00
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
2021-09-18 20:26:29 +02:00
a3a49593e4
Bump media from 1.4.1 to 1.4.2
...
Bumps media from 1.4.1 to 1.4.2.
---
updated-dependencies:
- dependency-name: androidx.media:media
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-17 13:29:35 +00:00
1dcf6b9539
Enhance dependencies handling to support Dependabot
2021-09-17 14:58:44 +03:00
SpiritCroc
ganfra
Benoit Marty
dependabot[bot]
Benoit Marty
S1m
Adam Brown
ariskotsomitopoulos