f5afdefe2f
Merge tag 'v1.4.4' into sc
...
Change-Id: Ibfb35ec30a51abebb652044719417f62c8a6be50
Conflicts:
library/ui-styles/src/main/res/values/dimens.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/res/drawable/bg_unread_notification.xml
vector/src/main/res/drawable/ic_add_reaction_small.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
vector/src/main/res/xml/vector_settings_preferences.xml
2022-03-10 13:26:09 +01:00
d6cd3f5719
Upgrades to material 1.5.0 library
2022-03-01 14:35:22 +01:00
077c0eea98
Revert "AGP 7.1.0"
2022-02-04 12:20:20 +02:00
7b9da40e52
[merge] Use java 11 again, pt.2
...
Change-Id: I136053222ffa1a264ce97a9d6ec51515e10208a0
2022-01-29 14:59:20 +01:00
a9d5700d2b
Merge tag 'v1.3.16' into sc
...
Change-Id: I8b3937f4ac30d3e72e2cb694eee2dc5bf034cb75
Conflicts:
gradle.properties
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.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/di/NetworkModule.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.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/DefaultTimeline.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/MessageComposerViewState.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/detail/timeline/action/MessageActionsViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
vector/src/main/res/layout/activity_call.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/layout/view_voice_message_recorder.xml
vector/src/main/res/values/config.xml
vector/src/main/res/xml/vector_settings_labs.xml
2022-01-29 12:18:19 +01:00
4aff1ab017
AGP 7.1.0
2022-01-27 16:08:47 +01:00
194a584e4c
Merge branch hotfix/1.3.15
2022-01-18 14:21:09 +01:00
bdd30e3b8f
Fix crash when viewing source which contains an emoji.
...
Import source of jsonviewer as a module of this project.
2022-01-18 12:04:06 +01:00
f2165201eb
Remove unused module matrix-sdk-android-rx and do some cleanup
2022-01-13 17:54:25 +01:00
261030f51e
- Fix integration tests (still not perfect while github actions are very very limited for that)
...
- Split them in msdk and app test along with multiple smaller steps.
- Mark the not working tests with @Ignore so that they will not run neither local or on github actions
- Add user friendly comment on PR to view the results
2022-01-05 23:42:57 +02:00
5bfba837c1
Add group for dependency, and use latest markwon version
2021-12-31 17:01:11 +01:00
95b1ae9488
Merge branch 'develop' into maths
2021-12-31 16:41:06 +01:00
acdd4e24b9
Merge tag 'v1.3.12' into sc
...
Change-Id: I66c0120371c3f52295f033ec21702c08381b5b10
Conflicts:
build.gradle
vector/build.gradle
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/helper/TimelineEventVisibilityHelper.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.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/roomprofile/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/res/drawable/highlighted_message_background.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
vector/src/main/res/layout/fragment_home_detail.xml
vector/src/main/res/layout/fragment_login_server_selection.xml
vector/src/main/res/layout/fragment_room_detail.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_expandable_textview.xml
vector/src/main/res/layout/item_login_header.xml
vector/src/main/res/layout/item_radio.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
vector/src/main/res/layout/item_timeline_event_poll_stub.xml
vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
vector/src/main/res/layout/item_timeline_event_voice_stub.xml
vector/src/main/res/layout/view_stub_room_profile_header.xml
vector/src/main/res/layout/view_url_preview.xml
vector/src/main/res/xml/vector_settings_labs.xml
vector/src/main/res/xml/vector_settings_root.xml
2021-12-23 14:36:13 +01:00
f97753fdc1
Bump gradle from 7.0.3 to 7.0.4
...
Bumps gradle from 7.0.3 to 7.0.4.
---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-08 23:07:58 +00:00
d13a3eaad5
Bump mavericks from 2.4.0 to 2.5.0
...
Bumps `mavericks` from 2.4.0 to 2.5.0.
Updates `mavericks` from 2.4.0 to 2.5.0
- [Release notes](https://github.com/airbnb/mavericks/releases )
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md )
- [Commits](https://github.com/airbnb/mavericks/compare/2.4.0...2.5.0 )
Updates `mavericks-testing` from 2.4.0 to 2.5.0
- [Release notes](https://github.com/airbnb/mavericks/releases )
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md )
- [Commits](https://github.com/airbnb/mavericks/compare/2.4.0...2.5.0 )
---
updated-dependencies:
- dependency-name: com.airbnb.android:mavericks
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: com.airbnb.android:mavericks-testing
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-08 00:40:35 +00:00
0defac348e
Bump dagger from 2.40.4 to 2.40.5
...
Bumps `dagger` from 2.40.4 to 2.40.5.
Updates `hilt-android-gradle-plugin` from 2.40.4 to 2.40.5
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.4...dagger-2.40.5 )
Updates `dagger` from 2.40.4 to 2.40.5
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.4...dagger-2.40.5 )
Updates `dagger-compiler` from 2.40.4 to 2.40.5
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.4...dagger-2.40.5 )
Updates `hilt-android` from 2.40.4 to 2.40.5
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.4...dagger-2.40.5 )
Updates `hilt-compiler` from 2.40.4 to 2.40.5
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.4...dagger-2.40.5 )
---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-android
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-compiler
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-06 23:08:06 +00:00
4b63a9f939
Merge tag 'v1.3.9' into sc
...
Change-Id: I26834af19e0b02887f288b6441ced6d993cb8861
Conflicts:
vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt
vector/src/main/java/im/vector/app/VectorApplication.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/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/composer/VoiceMessageRecorderView.kt
vector/src/main/res/drawable/ic_shield_custom.xml
vector/src/main/res/drawable/ic_shield_trusted.xml
2021-12-05 13:46:55 +01:00
850620cd99
Bump dagger from 2.40.3 to 2.40.4
...
Bumps `dagger` from 2.40.3 to 2.40.4.
Updates `hilt-android-gradle-plugin` from 2.40.3 to 2.40.4
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.3...dagger-2.40.4 )
Updates `dagger` from 2.40.3 to 2.40.4
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.3...dagger-2.40.4 )
Updates `dagger-compiler` from 2.40.3 to 2.40.4
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.3...dagger-2.40.4 )
Updates `hilt-android` from 2.40.3 to 2.40.4
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.3...dagger-2.40.4 )
Updates `hilt-compiler` from 2.40.3 to 2.40.4
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.3...dagger-2.40.4 )
---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-android
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-compiler
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-02 23:08:16 +00:00
7c41d3cacb
Bump dagger from 2.40.2 to 2.40.3
...
Bumps `dagger` from 2.40.2 to 2.40.3.
Updates `hilt-android-gradle-plugin` from 2.40.2 to 2.40.3
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.2...dagger-2.40.3 )
Updates `dagger` from 2.40.2 to 2.40.3
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.2...dagger-2.40.3 )
Updates `dagger-compiler` from 2.40.2 to 2.40.3
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.2...dagger-2.40.3 )
Updates `hilt-android` from 2.40.2 to 2.40.3
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.2...dagger-2.40.3 )
Updates `hilt-compiler` from 2.40.2 to 2.40.3
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.2...dagger-2.40.3 )
---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-android
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-compiler
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-29 23:08:54 +00:00
c9637967c9
Bump dagger from 2.40.1 to 2.40.2
...
Bumps `dagger` from 2.40.1 to 2.40.2.
Updates `hilt-android-gradle-plugin` from 2.40.1 to 2.40.2
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.1...dagger-2.40.2 )
Updates `dagger` from 2.40.1 to 2.40.2
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.1...dagger-2.40.2 )
Updates `dagger-compiler` from 2.40.1 to 2.40.2
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.1...dagger-2.40.2 )
Updates `hilt-android` from 2.40.1 to 2.40.2
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.1...dagger-2.40.2 )
Updates `hilt-compiler` from 2.40.1 to 2.40.2
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.1...dagger-2.40.2 )
---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-android
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-compiler
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-24 23:08:16 +00:00
42c0df8f26
Merge pull request #4496 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.4.0
...
Bump appcompat from 1.3.1 to 1.4.0
2021-11-18 11:24:32 +01:00
00ab7aaea9
Merge branch 'develop' into dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.2
2021-11-18 10:18:44 +01:00
958be65389
Merge pull request #4493 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.7.1
...
Bump work-runtime-ktx from 2.7.0 to 2.7.1
2021-11-18 10:17:34 +01:00
bff72a4d52
Bump appcompat from 1.3.1 to 1.4.0
...
Bumps appcompat from 1.3.1 to 1.4.0.
---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-17 23:08:48 +00:00
84d86a5433
Bump constraintlayout from 2.1.1 to 2.1.2
...
Bumps [constraintlayout](https://github.com/androidx/constraintlayout ) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/androidx/constraintlayout/releases )
- [Commits](https://github.com/androidx/constraintlayout/commits )
---
updated-dependencies:
- dependency-name: androidx.constraintlayout:constraintlayout
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-17 23:07:57 +00:00
f56691a942
Bump work-runtime-ktx from 2.7.0 to 2.7.1
...
Bumps work-runtime-ktx from 2.7.0 to 2.7.1.
---
updated-dependencies:
- dependency-name: androidx.work:work-runtime-ktx
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-17 23:07:14 +00:00
9ae6197f4c
Bump fragment-ktx from 1.3.6 to 1.4.0
...
Bumps fragment-ktx from 1.3.6 to 1.4.0.
---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-17 23:07:08 +00:00
d9a5991559
Merge tag 'v1.3.8' into HEAD
...
Change-Id: If3e3927755638ee38d8817f8504f09b0df14f309
Conflicts:
dependencies.gradle
vector/src/fdroid/AndroidManifest.xml
vector/src/gplay/AndroidManifest.xml
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
vector/src/main/AndroidManifest.xml
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/composer/ComposerEditText.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
2021-11-17 20:17:45 +01:00
c5f48fa4d2
Merge tag 'v1.3.7' into sc
...
Change-Id: Id73c834c10e11ccd46d7d2adc8328eb95d051941
Conflicts:
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/RoomSummaryEntity.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
vector/build.gradle
vector/src/fdroid/AndroidManifest.xml
vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
vector/src/main/java/im/vector/app/VectorApplication.kt
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
vector/src/main/java/im/vector/app/core/receiver/OnApplicationUpgradeOrRebootReceiver.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
2021-11-17 19:01:22 +01:00
d763c61c61
Bump mockk from 1.12.0 to 1.12.1
...
Bumps `mockk` from 1.12.0 to 1.12.1.
Updates `mockk` from 1.12.0 to 1.12.1
- [Release notes](https://github.com/mockk/mockk/releases )
- [Commits](https://github.com/mockk/mockk/compare/v1.12.0...1.12.1 )
Updates `mockk-android` from 1.12.0 to 1.12.1
- [Release notes](https://github.com/mockk/mockk/releases )
- [Commits](https://github.com/mockk/mockk/compare/v1.12.0...1.12.1 )
---
updated-dependencies:
- dependency-name: io.mockk:mockk
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: io.mockk:mockk-android
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-16 23:08:15 +00:00
be3aafeef2
Merge pull request #4433 from vector-im/feature/bma/android12
...
Android12
2021-11-16 13:27:33 +01:00
9429b039de
androidx.lifecycle:lifecycle-common-java8 -> androidx.lifecycle:lifecycle-common
...
https://developer.android.com/jetpack/androidx/releases/lifecycle#2.4.0
2021-11-15 12:24:48 +01:00
7e59c18050
Add dep for ProcessLifecycleOwner
2021-11-15 12:24:48 +01:00
a1630b5546
androidx.lifecycle:lifecycle-extensions is deprecated
...
See https://developer.android.com/jetpack/androidx/releases/lifecycle#declaring_dependencies
2021-11-15 12:24:48 +01:00
a1c8835f31
Same version for all lifecycle deps
2021-11-15 12:24:48 +01:00
2880798627
Bump core-ktx from 1.6.0 to 1.7.0
...
Bumps core-ktx from 1.6.0 to 1.7.0.
---
updated-dependencies:
- dependency-name: androidx.core:core-ktx
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-15 12:24:48 +01:00
540a1b52ad
Bump lifecycle-livedata-ktx from 2.3.1 to 2.4.0
...
Bumps lifecycle-livedata-ktx from 2.3.1 to 2.4.0.
---
updated-dependencies:
- dependency-name: androidx.lifecycle:lifecycle-livedata-ktx
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-15 12:24:48 +01:00
f1e1729d40
Bump work-runtime-ktx from 2.6.0 to 2.7.0
...
Bumps work-runtime-ktx from 2.6.0 to 2.7.0.
---
updated-dependencies:
- dependency-name: androidx.work:work-runtime-ktx
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-15 12:24:48 +01:00
aa3f36b7b7
Target API 31 - Android 12 - #4262
2021-11-15 12:24:48 +01:00
6afed3d5b7
Bump dagger from 2.40 to 2.40.1
...
Bumps `dagger` from 2.40 to 2.40.1.
Updates `hilt-android-gradle-plugin` from 2.40 to 2.40.1
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40...dagger-2.40.1 )
Updates `dagger` from 2.40 to 2.40.1
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40...dagger-2.40.1 )
Updates `dagger-compiler` from 2.40 to 2.40.1
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40...dagger-2.40.1 )
Updates `hilt-android` from 2.40 to 2.40.1
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40...dagger-2.40.1 )
Updates `hilt-compiler` from 2.40 to 2.40.1
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.40...dagger-2.40.1 )
---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-android
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-compiler
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-11 23:08:23 +00:00
f3655d4664
Merge pull request #4363 from vector-im/feature/fga/rx_flow_migration
...
Feature/fga/rx flow migration
2021-11-04 18:44:48 +01:00
5d9e94f250
Bump dagger from 2.39.1 to 2.40
...
Bumps `dagger` from 2.39.1 to 2.40.
Updates `hilt-android-gradle-plugin` from 2.39.1 to 2.40
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.39.1...dagger-2.40 )
Updates `dagger` from 2.39.1 to 2.40
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.39.1...dagger-2.40 )
Updates `dagger-compiler` from 2.39.1 to 2.40
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.39.1...dagger-2.40 )
Updates `hilt-android` from 2.39.1 to 2.40
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.39.1...dagger-2.40 )
Updates `hilt-compiler` from 2.39.1 to 2.40
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.39.1...dagger-2.40 )
---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger-compiler
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: com.google.dagger:hilt-android
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: com.google.dagger:hilt-compiler
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-10-27 23:07:36 +00:00
34cb99e8ae
Flow migration: remove Rx completely (rxbinding)
2021-10-27 12:13:49 +02:00
a9d192fa39
Flow migration: add back some test
2021-10-26 18:09:07 +02:00
9479342a64
Flow: remove more rx
2021-10-26 15:16:10 +02:00
e9b58844b3
Merge branch 'develop' into feature/fga/hilt_app_migration
2021-10-22 11:30:49 +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
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
97464969ea
Small formatting
2021-10-19 19:04:32 +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
SpiritCroc
ericdecanini
Aris Kotsomitopoulos
Benoit Marty
Benoit Marty
ariskotsomitopoulos
dependabot[bot]
ganfra