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
2dcc120cf7
Merge remote-tracking branch 'origin/develop' into dependency-cleanup
...
# Conflicts:
# build.gradle
# dependencies.gradle
2022-05-18 11:47:21 +02:00
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
4c95aafe10
Detekt: enable and fix EndOfSentenceFormat
2022-05-16 08:54:07 +02:00
c19563bed2
Detekt: fix UtilityClassWithPublicConstructor
2022-05-12 17:26:11 +02:00
4617d2d698
Merge tag 'v1.4.14' into sc
...
v1.4.14
Change-Id: I3667009380f1e35ce05c75c3769e62e3446212db
Conflicts:
.editorconfig
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.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
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
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.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/VectorApplication.kt
vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
vector/src/main/java/im/vector/app/core/receiver/BackgroundSyncStarter.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/TimelineControllerInterceptorHelper.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/RoomListSectionBuilderSpace.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/members/RoomMemberListViewModel.kt
vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.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/SpaceSummaryController.kt
2022-05-05 17:41:26 +02:00
c21ec983e8
Merge pull request #5805 from vector-im/task/eric/format-project
...
Formats project with new code style
2022-04-21 12:43:28 +02:00
de899bbb18
Formats entire project
2022-04-21 11:50:15 +02:00
6aa0be22c9
Makes MediaType internal
2022-04-21 10:42:08 +02:00
0556a3d088
Makes MediaFileUtils function internal
2022-04-19 13:31:37 +02:00
2c84f234a6
Cleanup
2022-04-17 11:09:10 +02:00
a8bbf29b42
Remove unused dependencies
2022-04-15 22:50:54 +02:00
b76ec78c5d
Fixes build error in CameraVideoPicker
2022-04-14 11:46:59 +02:00
da843443ef
Convert MediaFileUtils to a non-object
2022-04-14 11:28:14 +02:00
8b66034af5
Adds mkdirs fix to CameraPicker and CameraVideoPicker
2022-04-13 15:16:34 +02:00
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
9a02543afd
FTUE - Choose a display picture ( #5323 )
...
* adding tests around the onboarding view model
- cases for the personalisation and display name actions
* adding base choose name fragment with UI
* add click handling for the display name actions
* adding tests around the onboarding view model
- cases for the personalisation and display name actions
* adding barebones profile picture fragment with ability to select a user avatar
* extracting uri filename resolving to a class which can be injected
- includes tests
* updating upstream avatar on profile picture save and continue step
- moves the personalisation state to a dedicated model to allow for back and forth state restoration
* adding test case for skipping profile picture setting
* taking the profile loading into account when rendering the onboarding loading
* extracting method for the handling of the profile picture selection
* adding dedicated camera icon for choosing profile picture
* adding toolbar to back to profile picture page
- this toolbar will fade in with the fragment as it sits at the fragment level, probably worth revisiting once more pages have a toolbar
* changing edit/add picture icon based on if we're already selected an image
* making use of debounced clicks to avoid potential extra clicks
* making the avatar height and camera icon relative percentage based
- also makes the avatar itself clicking, including a foreground ripple
* fixing formatting
* making use of fake session id for user id assertion
* using a real matrix id syntax for the fake session user id
* removing duplicated dimens
* using self closing imageview tag
2022-03-07 14:07:22 +00:00
4651c45b2f
moves multipicker module to library
2022-02-22 19:48:48 +01:00
SpiritCroc
Olivér Falvai
Benoit Marty
Benoit Marty
Eric Decanini
Adam Brown