SpiritCroc
87100a8536
Merge remote-tracking branch 'upstream/develop' into sc
...
Change-Id: Ifed09540802774e7b1d3f2ab787a7f42f1030b28
Conflicts:
vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
2022-12-07 14:56:07 +01:00
Florian Renaud
c20500ab7a
Merge pull request #7590 from vector-im/dependabot/gradle/com.adevinta.android-barista-4.3.0
...
Bump barista from 4.2.0 to 4.3.0
2022-12-01 14:34:53 +01:00
dependabot[bot]
b58050f496
Bump kotlin-reflect from 1.7.21 to 1.7.22 ( #7665 )
...
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin ) from 1.7.21 to 1.7.22.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.7.22 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
dependency-type: direct:production
update-type: version-update:semver-patch
...
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-11-30 09:13:47 +00:00
SpiritCroc
3eeca39c4b
Merge tag 'v1.5.8' into sc
...
Release 1.5.8
Change-Id: I763148cfe6bb2155682637ce4c339951441b87ce
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/session/sync/SyncResponseHandler.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/MessageComposerFragment.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/timeline/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/res/layout/fragment_timeline.xml
2022-11-18 16:11:16 +01:00
dependabot[bot]
e4caf7be81
Bump barista from 4.2.0 to 4.3.0
...
Bumps [barista](https://github.com/AdevintaSpain/Barista ) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/AdevintaSpain/Barista/releases )
- [Commits](https://github.com/AdevintaSpain/Barista/compare/4.2.0...4.3.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>
2022-11-15 23:03:53 +00:00
Benoit Marty
7481b5b342
Merge pull request #7515 from vector-im/dependabot/gradle/org.checkerframework-checker-3.27.0
...
Bump checker from 3.11.0 to 3.27.0
2022-11-10 16:29:25 +01:00
Benoit Marty
45e106d634
Merge pull request #7551 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-reflect-1.7.21
...
Bump kotlin-reflect from 1.7.20 to 1.7.21
2022-11-10 16:20:10 +01:00
dependabot[bot]
e84c68495f
Bump posthog from 1.1.2 to 2.0.0
...
Bumps [posthog](https://github.com/PostHog/posthog-android ) from 1.1.2 to 2.0.0.
- [Release notes](https://github.com/PostHog/posthog-android/releases )
- [Changelog](https://github.com/PostHog/posthog-android/blob/master/CHANGELOG.md )
- [Commits](https://github.com/PostHog/posthog-android/compare/1.1.2...2.0.0 )
---
updated-dependencies:
- dependency-name: com.posthog.android:posthog
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-11-09 23:03:47 +00:00
dependabot[bot]
25d33e9b1a
Bump kotlin-reflect from 1.7.20 to 1.7.21
...
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin ) from 1.7.20 to 1.7.21.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/commits )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-11-08 23:11:03 +00:00
Benoit Marty
dff210c6c9
Merge pull request #7498 from vector-im/dependabot/gradle/com.gabrielittner.threetenbp-lazythreetenbp-0.12.0
...
Bump lazythreetenbp from 0.11.0 to 0.12.0
2022-11-07 15:42:59 +01:00
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
dependabot[bot]
bb02209537
Bump checker from 3.11.0 to 3.27.0
...
Bumps [checker](https://github.com/typetools/checker-framework ) from 3.11.0 to 3.27.0.
- [Release notes](https://github.com/typetools/checker-framework/releases )
- [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md )
- [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.11.0...checker-framework-3.27.0 )
---
updated-dependencies:
- dependency-name: org.checkerframework:checker
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-11-02 23:10:39 +00:00
dependabot[bot]
d2012ae022
Bump lazythreetenbp from 0.11.0 to 0.12.0
...
Bumps [lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp ) from 0.11.0 to 0.12.0.
- [Release notes](https://github.com/gabrielittner/lazythreetenbp/releases )
- [Changelog](https://github.com/gabrielittner/lazythreetenbp/blob/main/CHANGELOG.md )
- [Commits](https://github.com/gabrielittner/lazythreetenbp/compare/0.11.0...0.12.0 )
---
updated-dependencies:
- dependency-name: com.gabrielittner.threetenbp:lazythreetenbp
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 23:10:15 +00: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
f93f43bf8b
Fix issue with Jitsi compilation
...
Error was lots of `Duplicate class org.checkerframework.common.reflection.qual.MethodVal found in modules jetified-checker-3.1 (org.checkerframework:checker:3.1.1) and jetified-checker-qual-3.12.0 (org.checkerframework:checker-qual:3.12.0)
Cannot use latest 3.15.0 since it required min API 26.
2022-10-27 14:36:45 +02:00
Benoit Marty
4515dcdfe9
Update Jitsi and WebRtc dependencies to android-sdk-6.2.2
2022-10-27 14:34:58 +02:00
Benoit Marty
5b6763ff89
Merge pull request #7349 from vector-im/dependabot/gradle/com.github.UnifiedPush-android-connector-2.1.1
...
Bump android-connector from 2.1.0 to 2.1.1
2022-10-25 11:12:07 +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
Maxime NATUREL
cf25b81e9a
Adding new shield color into resources
2022-10-14 14:00:01 +02:00
dependabot[bot]
9198cc7ac0
Bump android-connector from 2.1.0 to 2.1.1
...
Bumps [android-connector](https://github.com/UnifiedPush/android-connector ) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/UnifiedPush/android-connector/releases )
- [Commits](https://github.com/UnifiedPush/android-connector/compare/2.1.0...2.1.1 )
---
updated-dependencies:
- dependency-name: com.github.UnifiedPush:android-connector
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-12 23:07:54 +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
Eric Decanini
2fe636e93b
Adds Push Notification toggle to Device Manager ( #7261 )
...
* Adds push notifications switch
* Adds functionality to Push notification toggle
* Adds DefaultPushersServiceTest for togglePusher
* Adds DefaultTogglePusherTaskTest
* Adds SessionOverviewViewModelTest for toggling pusher
* Hides pusher toggle if there are no pushers of the device
* Adds changelog file
* Edits changelog file
* Fixes copyrights
* Unregisters checkedChangelistener in onDetachedFromWindow for switch view
* Fixes post merge errors
* Fixes legal copies
* Removes unused imports
* Fixes lint errors
* Fixes test errors
* Fixes error
* Fixes error
* Fixes error
* Fixes error
* Fixes error
2022-10-10 19:21:34 -04: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
cde088e315
Merge branch 'develop' into dependabot/gradle/epoxy-5.0.0
2022-10-05 17:29:17 +02: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
17cd2a3302
Merge pull request #7266 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-reflect-1.7.20
...
Bump kotlin-reflect from 1.7.10 to 1.7.20
2022-10-04 16:06:25 +02:00
Jorge Martín
8d54a0d759
Remove Robolectric, make Robolectric test an instrumentation test
2022-10-04 14:15:54 +02:00
Benoit Marty
cba920f3e5
Enable Ksp for Epoxy Processor
2022-10-03 16:45:23 +02:00
Valere
59afe434f8
more tests
2022-09-30 16:00:34 +02:00
Valere
ac0e5e9dec
fix broken test, userId confustion
...
cleaning
cleaning
add tests
cleaning
2022-09-30 16:00:34 +02:00
Jorge Martín
570bc57cc6
Restore validateEpoxyModelUsage
annotation processing arg
2022-09-30 09:44:23 +02:00
Jorge Martín
f5cb980020
Fix dependencies and code issues
2022-09-30 09:39:01 +02:00
dependabot[bot]
1db669d1c2
Bump kotlin-reflect from 1.7.10 to 1.7.20
...
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin ) from 1.7.10 to 1.7.20.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.20/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.7.20 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-09-29 23:21:58 +00:00
Adam Brown
0f19726fe2
creating custom tasks to record and verify screenshot
...
- introduces a 'screenshot' flag to include/exclude the screenshot tests from the default test runs
2022-09-26 10:26:38 +01:00
Adam Brown
c66a38057e
adding paparazzi screenshot testing lib setup
2022-09-26 10:26:38 +01:00
Adam Brown
2c1eef7a59
Merge pull request #7142 from vector-im/feature/adm/dialpad-lib
...
Manually including `im.dlg:android-dialer:1.2.5`
2022-09-26 10:14:56 +01:00
SpiritCroc
bb6595110b
Merge tag 'v1.5.0' into merge-v1.5.0
...
Change-Id: Ifaa56941340ac1774d8b7bd470e32c5203d15f69
Conflicts:
library/ui-styles/src/main/res/values/colors.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt
vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
vector/build.gradle
vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteEmojiDataItem.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/RoomListViewState.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/res/menu/menu_new_home.xml
vector/src/main/res/xml/vector_settings_labs.xml
2022-09-23 16:28:00 +02:00
dependabot[bot]
2aa9382fba
Bump android-connector from 2.0.1 to 2.1.0
...
Bumps [android-connector](https://github.com/UnifiedPush/android-connector ) from 2.0.1 to 2.1.0.
- [Release notes](https://github.com/UnifiedPush/android-connector/releases )
- [Commits](https://github.com/UnifiedPush/android-connector/compare/2.0.1...2.1.0 )
---
updated-dependencies:
- dependency-name: com.github.UnifiedPush:android-connector
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-09-22 14:31:16 +00:00
SpiritCroc
cffa41da95
Disable firebase appdistribution
...
We don't want to use it.
And we do not want the REQUEST_INSTALL_PACKAGES permission from that.
Change-Id: I82aeab98116bebeface33667e604300df0a71fa7
2022-09-17 10:29:54 +02:00
dependabot[bot]
d9ee51a212
Bump emoji2 from 1.1.0 to 1.2.0
...
Bumps emoji2 from 1.1.0 to 1.2.0.
---
updated-dependencies:
- dependency-name: androidx.emoji2:emoji2
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-09-16 23:00:39 +02:00
Adam Brown
739a513f89
moving external library modules to an external directory
2022-09-16 15:15:32 +01:00
Adam Brown
5058f942af
manually including the im.dlg:android-dialer:1.2.5
...
- avoids using appcompat
- avoids using an artifact without a source repository
2022-09-16 15:15:32 +01:00
Adam Brown
11e6ca1784
moving the jitsi exclude directly to the dependency so that other modules also get the exclusion
...
- also excludes the support dependency from the barcode scanner
2022-09-16 12:16:03 +01:00
Adam Brown
be9c9f1640
formatting
2022-09-16 11:37:39 +01:00
Adam Brown
4e99217164
excluding jitsi's android-scalablevideoview fork's support library
...
- The library exports a jetified artifact but doesn't remove the support library dependency /home/adam/dev/element/element-android/vector/build.gradle
2022-09-16 11:37:39 +01:00
Adam Brown
c61df899b4
removing unused dependency
2022-09-16 11:37:39 +01:00
Adam Brown
ca92ad267d
excluding compile time legacy support annotations from dependencies
2022-09-16 11:37:38 +01:00