51274af2fe
Merge tag 'v1.5.24' into sc
...
Change-Id: I3eda119f38061c31595d9087f6067b269b87d8d1
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
2023-02-08 13:08:42 +01:00
9383319b37
Fix import
2023-02-01 23:26:49 +01:00
9a31aa3b91
Move clock to core-utils module
2023-01-31 16:45:48 +01:00
25dddf7566
Merge tag 'v1.5.16' into sc
...
Change-Id: I98c122b95dd3758d41f4845a42ec9ed2371e174f
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
2022-12-30 17:58:06 +01:00
53b1bec5db
try fix lint
2022-12-29 10:51:57 +01:00
6f5d8d6ece
FIx UI Tests
2022-12-28 18:09:28 +01:00
d20121603a
sync filter params moved to matrix config
2022-12-23 13:10:27 +01:00
f5dcf25a6d
Merge tag 'v1.5.13' into sc
...
Change-Id: I16e8750adb88c86ad6af84f60d904fd5e16d2f13
2022-12-19 18:04:43 +01:00
ed01f32393
Add `largeHeap=true` in the manifest since we are seeing more crashes (OOM) when handling sync response.
2022-12-19 16:54:15 +01:00
05fc840b3b
[merge] Fix gplay build
...
Change-Id: I1fe6ca3a1b2e4355377da9e508b56c4e44eb7c26
2022-12-15 11:45:48 +01:00
330f0cf5cc
Merge tag 'v1.5.12' into sc
...
Change-Id: I4c53d64845ee05ff395e5df436a0739c87798737
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/room/summary/RoomSummaryUpdater.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
vector-app/build.gradle
vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
vector-config/src/main/res/values/config-settings.xml
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/timeline/format/DisplayableEventFormatter.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
2022-12-15 11:01:52 +01:00
c74ea2dd16
Merge pull request #7719 from vector-im/feature/fre/voice_broadcast_last_message
...
Voice Broadcast - Update last message in the room list
2022-12-14 17:39:42 +01:00
de18f37849
[Rich text editor] Add error tracking for rich text editor ( #7695 )
2022-12-08 11:43:19 +00:00
69beef4648
Show voice broadcast events in the room list
...
fix factory
2022-12-07 18:11:51 +01:00
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
988afa4ebe
Fix FDroid build
2022-12-06 18:21:07 +01:00
0d12dbbe7e
Disable the Nightly popup, user registration (with `updateIfNewReleaseAvailable()`) to get upgrade does not work.
...
Add a nightly build section in the preferences to manually try to upgrade.
2022-12-06 12:51:46 +01:00
4dbca7858c
Adding new use cases to handle the Unified push registration
2022-12-05 09:41:23 +01:00
5aa3a4a764
Re-generate icons
...
Change-Id: I25836945ef12e1ebd2059983988e4ed44cd3d8d4
2022-12-03 15:44:11 +01:00
2f238efde0
Merge remote-tracking branch 'NathanC/themable-icons' into merge-v1.5.10
...
Change-Id: I4abbebfb8f4a322f4a5942a148b6c16a879a4044
2022-12-03 15:38:45 +01:00
34d29dc9d7
Merge pull request #7694 from vector-im/feature/ons/unverified_sessions_alert
...
Remind unverified sessions with a banner once a week (PSG-892)
2022-12-03 14:23:10 +03:00
f32e491c72
Adds in themable icon, with beta variant
2022-12-02 23:57:57 -08:00
65be0039a5
Merge tag 'v1.5.10' into merge-v1.5.10
...
TODO: re-implement our composer constraint changes
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.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/query/ReadQueries.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.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/TimelineViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.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/PlainTextComposerLayout.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.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/CheckIfCanReplyEventUseCase.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/res/drawable/ic_voice_mic_recording.xml
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
vector/src/main/res/layout/composer_rich_text_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_rich_text_layout_constraint_set_expanded.xml
vector/src/main/res/layout/composer_rich_text_layout_constraint_set_fullscreen.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_preferences.xml
vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt
Change-Id: I55e95d86b4bb019544d75dcb653afe05194cd224
2022-12-02 22:03:17 +01:00
4050975a19
Implement new logic for new login banner.
2022-12-02 18:15:10 +03:00
9ca7415f5a
Remove usage of Buildkite.
...
Build number is just removed.
Related script will need to be updated separately.
2022-11-24 14:49:55 +01:00
20081e8806
Log exit reason
...
Change-Id: I1c2e43781f41a739fdd90a74f982ae83704863b7
2022-11-19 15:43:28 +01:00
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
d954c9eae4
Merge pull request #6195 from vector-im/feature/bma/jitsi_5_1_0
...
Upgrade Jitsi SDK to 6.2.2
2022-11-02 12:10:25 +01:00
b6746653f1
Add metrics plugin to track device download keys task ( #7438 )
...
* Add metrics tracking plugin for download device keys
* Add support for multiple metrics plugin
* Update copyright license header in matrix-sdk-android
* Add tests for MetricExtension
* Update changelog
* Improve MetricsExtension and reformatting
2022-11-02 13:43:57 +05:30
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
46d1795276
Fix crash due to missing notification
...
Thread: main, Exception: java.lang.RuntimeException: Unable to start service org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService@3d1f0bc with Intent { cmp=im.vector.app.debug/org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService (has extras) }: java.lang.IllegalArgumentException: Invalid notification (no valid small icon): Notification(channel=JitsiOngoingConferenceChannel pri=0 contentView=null vibrate=null sound=null defaults=0x0 flags=0xa color=0x00000000 category=call actions=2 vis=PUBLIC semFlags=0x0 semPriority=0 semMissedCount=0)
2022-10-28 11:10:08 +02:00
16a5046601
Add a DebugJitsiActivity for debug build only. It's quite useless...
2022-10-27 14:34:58 +02:00
59cf20be35
added UI tests for new App Layout's screens ( #7305 )
2022-10-24 11:01:44 +02:00
31811bb7e0
Fix crash by disabling Flipper on API 22 and below ( #7428 )
...
* Disable Flipper on API 21 and below - only affects debug builds.
Due to a bug: https://github.com/facebook/flipper/issues/3572
* Add jonnyandrew to PR sign-off allowlist
Co-authored-by: Benoit Marty <benoit.marty@gmail.com>
2022-10-21 17:36:31 +01:00
f3309692a4
Merge pull request #7239 from vector-im/feature/bma/arch_fixes
...
Feature/bma/arch fixes
2022-10-18 11:47:12 +02:00
47c87141b2
Merge pull request #7338 from vector-im/feature/ons/qr_code_login_ui
...
QR Code Login UI
2022-10-17 17:20:07 +03:00
aa806ed2c6
More cleanup on @Inject members
2022-10-17 15:07:11 +02:00
cbd0972eca
Reuse injected members in parent activity.
2022-10-17 15:06:22 +02:00
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
6c10a9bf2d
Code review fixes.
2022-10-14 18:10:18 +03:00
5953346b3d
Merge branch 'develop' into feature/ons/qr_code_login_ui
...
# Conflicts:
# library/ui-strings/src/main/res/values/strings.xml
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
# vector/src/main/java/im/vector/app/features/VectorFeatures.kt
2022-10-14 15:17:55 +03:00
343cf74871
Add flag to allow QR login on all servers + split flag for showing in device manager
2022-10-14 01:45:03 +01:00
92a2420952
Merge pull request #7293 from vector-im/feature/bma/android13
...
Android 13
2022-10-13 13:52:52 +02:00
1e1affbb7b
Merge branch 'develop' into feature/ons/qr_code_login_ui
...
# Conflicts:
# library/ui-strings/src/main/res/values/strings.xml
# library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
# vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
# vector/src/main/java/im/vector/app/features/VectorFeatures.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
# vector/src/main/res/layout/fragment_other_sessions.xml
# vector/src/main/res/layout/fragment_settings_devices.xml
2022-10-12 14:32:09 +03:00
d8ea9c8215
Add flag for qr code login.
2022-10-11 20:04:18 +03:00
7b352b44dc
Replacing the feature flag by the new lab flag
2022-10-11 17:48:19 +02:00
a096ff03c8
Merge pull request #7217 from vector-im/feature/eric/msc3881
...
Implements MSC3881 (enabled and device_id fields for Pusher API)
2022-10-10 12:37:47 -04:00
267431d06e
Fixes error
2022-10-10 11:37:39 -04:00
4af2e62150
Merge branch 'develop' into feature/eric/msc3881
2022-10-09 12:45:19 -04:00
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
SpiritCroc
Florian Renaud
valere
NIkita Fedrunov
Benoit Marty
Yoan Pintas
jonnyandrew
Maxime NATUREL
Onuray Sahin
Nathan
Onuray Sahin
ganfra
Amit Kumar
Nikita Fedrunov
Benoit Marty
dependabot[bot]
Hugh Nimmo-Smith
Eric Decanini