SpiritCroc
eab87760fe
Merge tag 'v1.5.6' into sc
...
Change-Id: I4c39b35ff50c57cc9894b709a91691fa745cb0a6
Conflicts:
dependencies.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.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/mapper/RoomSummaryMapper.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/sync/handler/room/RoomSyncHandler.kt
vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
2022-11-03 09:31:58 +01:00
SpiritCroc
759da1fd09
Merge tag 'v1.5.4' into merge-v1.5.4
...
Change-Id: I3028022ed007c35d0ddbd6a859bc71958b8d2146
Conflicts:
library/ui-styles/src/main/res/values/colors.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.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/session/room/send/LocalEchoEventFactory.kt
vector-config/src/main/res/values/config-settings.xml
vector/src/main/java/im/vector/app/SpaceStateHandler.kt
vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/MessageComposerView.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/voice/VoiceMessageViews.kt
vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
vector/src/main/res/drawable/ic_voice_mic.xml
vector/src/main/res/layout/fragment_timeline.xml
vector/src/main/res/layout/view_voice_message_recorder.xml
vector/src/main/res/xml/vector_settings_labs.xml
2022-10-28 18:02:53 +02:00
Benoit Marty
3632e6dc8a
Replace library org.apache.sanselan:sanselan:0.97-incubator
with org.apache.commons:commons-imaging:1.0-alpha3
2022-10-26 12:32:27 +02:00
Benoit Marty
cbb0d4b438
Merge pull request #7442 from vector-im/dependabot/gradle/androidx.activity-activity-ktx-1.6.1
...
Bump activity-ktx from 1.6.0 to 1.6.1 - REQUIRES CHANGES ON THE CODE
2022-10-25 16:04:31 +02:00
dependabot[bot]
d908ca6b02
Bump activity-ktx from 1.6.0 to 1.6.1
...
Bumps activity-ktx from 1.6.0 to 1.6.1.
---
updated-dependencies:
- dependency-name: androidx.activity:activity-ktx
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-25 10:09:03 +00:00
Benoit Marty
ac332a8b83
Merge branch 'develop' into feature/bma/paparazzi_version
2022-10-25 11:51:46 +02:00
Benoit Marty
8fb650f34b
Merge pull request #7443 from vector-im/dependabot/gradle/io.sentry-sentry-android-6.6.0
...
Bump sentry-android from 6.4.3 to 6.6.0
2022-10-25 11:48:13 +02:00
Benoit Marty
f4549b6b0d
Merge branch 'develop' into feature/bma/paparazzi_version
2022-10-25 11:26:17 +02:00
Benoit Marty
1309f9b6ea
Merge pull request #7347 from vector-im/dependabot/gradle/appDistribution-16.0.0-beta05
...
Bump appDistribution from 16.0.0-beta04 to 16.0.0-beta05
2022-10-25 11:13:09 +02:00
Benoit Marty
dbd4f6e4f5
Merge pull request #7416 from vector-im/dependabot/gradle/com.google.android.material-material-1.7.0
...
Bump material from 1.6.1 to 1.7.0
2022-10-25 11:09:53 +02:00
Benoit Marty
2f6ebbd0af
Merge pull request #7440 from vector-im/dependabot/gradle/fragment-1.5.4
...
Bump fragment from 1.5.3 to 1.5.4
2022-10-25 11:07:50 +02:00
Benoit Marty
80c48f47a1
Merge pull request #7444 from vector-im/dependabot/gradle/androidx.exifinterface-exifinterface-1.3.5
...
Bump exifinterface from 1.3.4 to 1.3.5
2022-10-25 11:05:09 +02:00
dependabot[bot]
b3dcc605d9
Bump exifinterface from 1.3.4 to 1.3.5
...
Bumps exifinterface from 1.3.4 to 1.3.5.
---
updated-dependencies:
- dependency-name: androidx.exifinterface:exifinterface
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-24 23:11:23 +00:00
dependabot[bot]
76ab69e7a5
Bump sentry-android from 6.4.3 to 6.6.0
...
Bumps [sentry-android](https://github.com/getsentry/sentry-java ) from 6.4.3 to 6.6.0.
- [Release notes](https://github.com/getsentry/sentry-java/releases )
- [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md )
- [Commits](https://github.com/getsentry/sentry-java/compare/6.4.3...6.6.0 )
---
updated-dependencies:
- dependency-name: io.sentry:sentry-android
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-24 23:10:34 +00:00
dependabot[bot]
8163d0d47b
Bump kluent-android from 1.68 to 1.72
...
Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent ) from 1.68 to 1.72.
- [Release notes](https://github.com/MarkusAmshove/Kluent/releases )
- [Changelog](https://github.com/MarkusAmshove/Kluent/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MarkusAmshove/Kluent/compare/v1.68...v1.72 )
---
updated-dependencies:
- dependency-name: org.amshove.kluent:kluent-android
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-24 23:09:47 +00:00
dependabot[bot]
085fbcf2fa
Bump fragment from 1.5.3 to 1.5.4
...
Bumps `fragment` from 1.5.3 to 1.5.4.
Updates `fragment-ktx` from 1.5.3 to 1.5.4
Updates `fragment-testing` from 1.5.3 to 1.5.4
---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-24 23:08:46 +00:00
dependabot[bot]
ad7a6bd76b
Bump material from 1.6.1 to 1.7.0
...
Bumps [material](https://github.com/material-components/material-components-android ) from 1.6.1 to 1.7.0.
- [Release notes](https://github.com/material-components/material-components-android/releases )
- [Commits](https://github.com/material-components/material-components-android/compare/1.6.1...1.7.0 )
---
updated-dependencies:
- dependency-name: com.google.android.material:material
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-19 23:07:12 +00:00
dependabot[bot]
d0c5c3bc43
Bump flipper from 0.171.0 to 0.171.1
...
Bumps `flipper` from 0.171.0 to 0.171.1.
Updates `flipper` from 0.171.0 to 0.171.1
- [Release notes](https://github.com/facebook/flipper/releases )
- [Commits](https://github.com/facebook/flipper/compare/v0.171.0...v0.171.1 )
Updates `flipper-network-plugin` from 0.171.0 to 0.171.1
- [Release notes](https://github.com/facebook/flipper/releases )
- [Commits](https://github.com/facebook/flipper/compare/v0.171.0...v0.171.1 )
---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.facebook.flipper:flipper-network-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-18 23:07:29 +00:00
Benoit Marty
3ccabd647a
Merge pull request #7390 from vector-im/dependabot/gradle/flipper-0.171.0
...
Bump flipper from 0.170.0 to 0.171.0
2022-10-18 11:45:34 +02:00
dependabot[bot]
5c4c3c92d4
Bump flipper from 0.170.0 to 0.171.0
...
Bumps `flipper` from 0.170.0 to 0.171.0.
Updates `flipper` from 0.170.0 to 0.171.0
- [Release notes](https://github.com/facebook/flipper/releases )
- [Commits](https://github.com/facebook/flipper/compare/v0.170.0...v0.171.0 )
Updates `flipper-network-plugin` from 0.170.0 to 0.171.0
- [Release notes](https://github.com/facebook/flipper/releases )
- [Commits](https://github.com/facebook/flipper/compare/v0.170.0...v0.171.0 )
---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-17 23:08:08 +00:00
Jorge Martín
76a11d97dc
Bump WYSIWYG lib to 0.2.1
2022-10-17 17:05:36 +02:00
Benoit Marty
b6639fcb09
Merge pull request #7368 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.57
...
Bump libphonenumber from 8.12.56 to 8.12.57
2022-10-17 15:02:38 +02:00
dependabot[bot]
93a346392b
Bump gradle from 7.2.2 to 7.3.1 ( #7364 )
...
* Bump gradle from 7.2.2 to 7.3.1
Bumps gradle from 7.2.2 to 7.3.1.
---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Try to fix build issue caused by KSP workaround
* Add missing dependency
* Suppress false positive in linter
* Suppress more false positives, fix 2 possible leaks
* Fix tests
* Ignore flaky test
* Use namespaces instead of packagenames in AndroidManifest files
* Reorder dependency groups
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
2022-10-17 09:14:28 +02:00
dependabot[bot]
989d4a6ed2
Bump flipper from 0.169.0 to 0.170.0 ( #7348 )
...
Bumps `flipper` from 0.169.0 to 0.170.0.
Updates `flipper` from 0.169.0 to 0.170.0
- [Release notes](https://github.com/facebook/flipper/releases )
- [Commits](https://github.com/facebook/flipper/compare/v0.169.0...v0.170.0 )
Updates `flipper-network-plugin` from 0.169.0 to 0.170.0
- [Release notes](https://github.com/facebook/flipper/releases )
- [Commits](https://github.com/facebook/flipper/compare/v0.169.0...v0.170.0 )
---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-14 10:37:11 +02:00
dependabot[bot]
1960dc3e41
Bump libphonenumber from 8.12.56 to 8.12.57
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.56 to 8.12.57.
- [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.56...v8.12.57 )
---
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>
2022-10-13 23:08:06 +00:00
Benoit Marty
92a2420952
Merge pull request #7293 from vector-im/feature/bma/android13
...
Android 13
2022-10-13 13:52:52 +02:00
Benoit Marty
e875d9d329
Ensure the latest paparazzi version is used, when updated by Dependabot.
...
Dependabot can update the plugin version, but not the library we add manually.
2022-10-13 11:52:35 +02:00
dependabot[bot]
4feb60145b
Bump appDistribution from 16.0.0-beta04 to 16.0.0-beta05
...
Bumps `appDistribution` from 16.0.0-beta04 to 16.0.0-beta05.
Updates `firebase-appdistribution-api-ktx` from 16.0.0-beta04 to 16.0.0-beta05
Updates `firebase-appdistribution` from 16.0.0-beta04 to 16.0.0-beta05
---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-appdistribution-api-ktx
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.firebase:firebase-appdistribution
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-12 23:06:56 +00:00
Benoit Marty
beb334babe
Merge pull request #7335 from vector-im/feature/bma/upgrade_arrow
...
Remove Arrow-kt dependency
2022-10-12 16:26:02 +02:00
Benoit Marty
1669316682
Remove dependency to arrow. Please use org.matrix.android.sdk.api.util.Optional
instead.
2022-10-12 10:20:52 +02:00
Jorge Martin Espinosa
def67b2e7d
Integrate WYSIWYG editor ( #7288 )
...
* Add WYSIWYG lib dependency
* Replace EditText with RichTextEditor
* Add bold button, fix sending formatting messages issues
* Add missing inline formatting buttons, make scrollview horizontal
* Disable autocomplete for rich text editor
* Add formatted text to messages sent, replies, quotes and edited messages.
* Several fixes
* Add changelog
* Try to fix lint issues
* Address review comments.
* Exclude Epoxy KSP generated files from ktlint checks
2022-10-11 17:05:47 +02:00
Benoit Marty
23654a9ff8
Merge pull request #7315 from vector-im/dependabot/gradle/glide-4.14.2
...
Bump glide from 4.14.1 to 4.14.2
2022-10-10 18:13:36 +02:00
dependabot[bot]
90afced6aa
Bump flipper from 0.164.0 to 0.169.0
...
Bumps `flipper` from 0.164.0 to 0.169.0.
Updates `flipper` from 0.164.0 to 0.169.0
- [Release notes](https://github.com/facebook/flipper/releases )
- [Commits](https://github.com/facebook/flipper/compare/v0.164.0...v0.169.0 )
Updates `flipper-network-plugin` from 0.164.0 to 0.169.0
- [Release notes](https://github.com/facebook/flipper/releases )
- [Commits](https://github.com/facebook/flipper/compare/v0.164.0...v0.169.0 )
---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-07 23:12:38 +00:00
dependabot[bot]
9ec2b6e8d5
Bump glide from 4.14.1 to 4.14.2
...
Bumps `glide` from 4.14.1 to 4.14.2.
Updates `glide` from 4.14.1 to 4.14.2
- [Release notes](https://github.com/bumptech/glide/releases )
- [Commits](https://github.com/bumptech/glide/compare/v4.14.1...v4.14.2 )
Updates `compiler` from 4.14.1 to 4.14.2
- [Release notes](https://github.com/bumptech/glide/releases )
- [Commits](https://github.com/bumptech/glide/compare/v4.14.1...v4.14.2 )
---
updated-dependencies:
- dependency-name: com.github.bumptech.glide:glide
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.github.bumptech.glide:compiler
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-07 23:11:33 +00:00
SpiritCroc
fe785613e7
Merge tag 'v1.5.2' into sc
...
Change-Id: I0fe8262be9f2e5852815ad5f93329ffa17970b0e
Conflicts:
vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
vector/src/main/res/layout/composer_layout.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
2022-10-07 20:32:26 +02:00
Benoit Marty
bd36831b31
Merge pull request #7302 from vector-im/dependabot/gradle/io.sentry-sentry-android-6.4.3
...
Bump sentry-android from 6.4.1 to 6.4.3
2022-10-07 09:47:35 +02:00
dependabot[bot]
667bbceebb
Bump exifinterface from 1.3.3 to 1.3.4
...
Bumps exifinterface from 1.3.3 to 1.3.4.
---
updated-dependencies:
- dependency-name: androidx.exifinterface:exifinterface
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-05 23:15:21 +00:00
dependabot[bot]
3e447dff29
Bump sentry-android from 6.4.1 to 6.4.3
...
Bumps [sentry-android](https://github.com/getsentry/sentry-java ) from 6.4.1 to 6.4.3.
- [Release notes](https://github.com/getsentry/sentry-java/releases )
- [Changelog](https://github.com/getsentry/sentry-java/blob/6.4.3/CHANGELOG.md )
- [Commits](https://github.com/getsentry/sentry-java/compare/6.4.1...6.4.3 )
---
updated-dependencies:
- dependency-name: io.sentry:sentry-android
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-05 23:14:38 +00:00
Benoit Marty
2d90524763
activity-ktx
2022-10-05 17:35:05 +02:00
Benoit Marty
933d84a230
androidx.activity:activity:1.6.0
2022-10-05 17:35:05 +02:00
Benoit Marty
4677c474eb
androidx.core:core-ktx:1.9.0
2022-10-05 17:35:05 +02:00
Benoit Marty
0fee37ced7
API 33
2022-10-05 17:35:05 +02:00
Benoit Marty
27e408fb0c
Fix bad merge conflict fix
2022-10-05 17:30:06 +02:00
Benoit Marty
cde088e315
Merge branch 'develop' into dependabot/gradle/epoxy-5.0.0
2022-10-05 17:29:17 +02:00
dependabot[bot]
8c35a8cf6b
Bump mavericks from 2.7.0 to 3.0.1
...
Bumps `mavericks` from 2.7.0 to 3.0.1.
Updates `mavericks` from 2.7.0 to 3.0.1
- [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.7.0...v3.0.1 )
Updates `mavericks-testing` from 2.7.0 to 3.0.1
- [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.7.0...v3.0.1 )
---
updated-dependencies:
- dependency-name: com.airbnb.android:mavericks
dependency-type: direct:production
update-type: version-update:semver-major
- dependency-name: com.airbnb.android:mavericks-testing
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-05 12:23:36 +00:00
Amit Kumar
aad2eed396
Add initial Sentry setup for crashes and perf tracking ( #7141 )
...
* Add initial Sentry setup for crashes and perf tracking
* Fix failing analytics tests
* Reformat code to fix style issue
* Close sentry when user signs out
* Add initial unit tests for Sentry
* Remove unused import
* Exclude amitkma from signoff requirements for PRs
2022-10-05 16:49:14 +05:30
SpiritCroc
af9548dfdd
Support inline images in the timeline ( #5877 )
...
* Support inline images in the timeline
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-04 17:59:52 +02:00
Benoit Marty
5a7483eb38
Merge pull request #7203 from vector-im/dependabot/gradle/dagger-2.44
...
Bump dagger from 2.42 to 2.44
2022-10-04 16:09:12 +02:00
Benoit Marty
984995dcb9
Merge pull request #7265 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.7.20
...
Bump kotlin-gradle-plugin from 1.7.10 to 1.7.20
2022-10-04 16:06:58 +02:00
Benoit Marty
90643510f2
Merge pull request #7269 from vector-im/dependabot/gradle/glide-4.14.1
...
Bump glide from 4.13.2 to 4.14.1
2022-10-04 15:53:26 +02:00