SpiritCroc
|
38c8e30541
|
Merge tag 'v1.5.26' into sc
Change-Id: Ie54ce4c15b4b95f7ecb4419f421762d7c57c5c2d
Conflicts:
dependencies.gradle
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/home/room/detail/TimelineViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/res/drawable/ic_composer_rich_text_editor_close.xml
vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml
vector/src/main/res/drawable/ic_rich_composer_add.xml
vector/src/main/res/drawable/ic_rich_composer_send.xml
|
2023-02-23 11:55:21 +01:00 |
|
Jorge Martin Espinosa
|
a358644354
|
Fix ktlint issue that was accidentally merged (#8139)
|
2023-02-16 11:14:15 +00:00 |
|
SpiritCroc
|
daacdd038c
|
Merge tag 'v1.5.25' into sc
Change-Id: I45d2198b25e7ebee157f4836596ef59ddb1fbe8e
|
2023-02-15 15:53:00 +01:00 |
|
Benoit Marty
|
4cf78795bd
|
Add extra cases.
|
2023-02-15 15:06:34 +01:00 |
|
Benoit Marty
|
f6711a3d16
|
Fix issue on timer when recording/playing voice message or voice broadcast. All the seconds were not properly displayed.
|
2023-02-15 12:23:12 +01:00 |
|
Florian Renaud
|
225f51d3fd
|
Update comment wording
|
2023-02-14 12:27:39 +01:00 |
|
Florian Renaud
|
68712513b3
|
Fix StackOverFlow exception when stop action is called within the tick event
|
2023-02-14 12:16:24 +01:00 |
|
SpiritCroc
|
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 |
|
Florian Renaud
|
912c37e3ff
|
Reset elapsed time on stop action and add a start method to the CountUpTimer
|
2023-02-06 10:36:40 +01:00 |
|
Florian Renaud
|
6f18c020ea
|
Add unit test on count up timer
|
2023-02-01 17:59:46 +01:00 |
|
Florian Renaud
|
3f6b60c63d
|
Replace ticker flow with simple coroutine
|
2023-01-31 17:34:10 +01:00 |
|
Florian Renaud
|
9a31aa3b91
|
Move clock to core-utils module
|
2023-01-31 16:45:48 +01:00 |
|
Florian Renaud
|
757bd5ff32
|
Remove clock from core-utils module
|
2023-01-31 16:08:30 +01:00 |
|
Florian Renaud
|
b904548ba0
|
Cancel and start a new timer on pause & resume
|
2023-01-31 15:45:41 +01:00 |
|
Florian Renaud
|
ecc0cb5f0b
|
CountUpTimer.elapsedTime now returns updated value
|
2023-01-30 14:25:02 +01:00 |
|
Florian Renaud
|
7bb7a627c4
|
Change variable to immutable
|
2023-01-30 14:12:09 +01:00 |
|
Florian Renaud
|
bdfebac76d
|
CountUpTimer - compute elapsed time using real time
|
2023-01-30 11:03:10 +01:00 |
|
Florian Renaud
|
af67705778
|
Add optional initial time parameter in CountUpTimer
|
2023-01-30 11:03:10 +01: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 |
|
Florian Renaud
|
392fe6fa32
|
Transform TickListener to fun interface
|
2022-11-07 15:34:54 +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 |
|
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 |
|
Benoit Marty
|
f2bbdc3906
|
API 33: fix compilation warnings
|
2022-10-05 17:35:05 +02:00 |
|
SpiritCroc
|
49663a1154
|
Merge tag 'v1.4.18' into sc
Change-Id: I58667aa99a8eb99b0b1e7f0784d811061c2086a5
Conflicts:
dependencies.gradle
library/attachment-viewer/build.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.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/summary/RoomSummaryDataSource.kt
vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
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/utils/Emoji.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/timeline/item/MessageImageVideoItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.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/media/ImageContentRenderer.kt
vector/src/main/res/xml/vector_settings_labs.xml
|
2022-06-01 13:54:34 +02:00 |
|
Olivér Falvai
|
f036d35829
|
Merge branch 'develop' into dependency-cleanup
|
2022-05-19 12:27:09 +02:00 |
|
Benoit Marty
|
38641c88b7
|
Fix usage of System.currentTimeMillis().
This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
|
2022-05-18 20:51:41 +02:00 |
|
Olivér Falvai
|
2dcc120cf7
|
Merge remote-tracking branch 'origin/develop' into dependency-cleanup
# Conflicts:
# build.gradle
# dependencies.gradle
|
2022-05-18 11:47:21 +02:00 |
|
SpiritCroc
|
4f60963741
|
Merge tag 'v1.4.16' into sc
Change-Id: Ibfb03ebf80dc1403fa438a390f609f2201602ba9
Conflicts:
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/session/room/timeline/DefaultTimeline.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.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/roommemberprofile/RoomMemberProfileController.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
vector/src/main/res/drawable/ic_settings_root_flair.xml
vector/src/main/res/layout/fragment_timeline.xml
vector/src/main/res/xml/vector_settings_labs.xml
|
2022-05-18 09:59:01 +02:00 |
|
Benoit Marty
|
4c95aafe10
|
Detekt: enable and fix EndOfSentenceFormat
|
2022-05-16 08:54:07 +02:00 |
|
Benoit Marty
|
c04655cd36
|
Fix warning: w: '-Xopt-in' is deprecated and will be removed in a future release, please use -opt-in instead
|
2022-05-09 22:08:24 +02:00 |
|
SpiritCroc
|
d44cb85dc7
|
Merge tag 'v1.4.12' into sc
Change-Id: I499d1a654345d59b01881da90e8f5b529ef4dfd2
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
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/query/ReadQueries.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
vector/src/main/java/im/vector/app/AppStateHandler.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/room/detail/RoomDetailViewEvents.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/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/res/layout/item_space_beta_header.xml
|
2022-04-24 11:15:52 +02:00 |
|
Olivér Falvai
|
a8bbf29b42
|
Remove unused dependencies
|
2022-04-15 22:50:54 +02:00 |
|
Benoit Marty
|
23d2a290ab
|
Global import optimization
|
2022-04-12 16:06:27 +02:00 |
|
SpiritCroc
|
45a5b8ca94
|
[merge] Further merge fixups
Change-Id: I8edf4ac5b67865843a8e3fb28146ba62195bb812
|
2022-01-29 15:56:13 +01:00 |
|
Benoit Marty
|
1c42df7752
|
Move the file to the new module.
|
2022-01-18 14:39:02 +01:00 |
|
Benoit Marty
|
ffad479dad
|
Move the file to the new module.
|
2022-01-18 14:30:59 +01:00 |
|
Benoit Marty
|
b8aaa177c2
|
Add a module library/core-utils as a base module for all util tools
|
2022-01-13 20:28:50 +01:00 |
|