* feature/mna/clean-vm-for-dm-v2:
RefreshDevicesOnCryptoDevicesChangeUseCase unit tests
Adding changelog entry
Fix some coding style issues
DevicesViewModel unit tests
GetDeviceFullInfoListUseCase unit tests
GetCurrentSessionCrossSigningInfoUseCase unit tests
RefreshDevicesUseCase unit tests
Updating existing unit tests
Listen verification + refresh devices use cases
Moving recently created use cases inside v2 package
Inject new ViewModel in the fragment V2 + add use cases
Declare MarkAsManuallyVerified action
Empty ViewModel V2
# Conflicts:
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
* feature/mna/session-overview-screen: (57 commits)
Fix missing mapper in CryptoStoreHelper for tests
Fix unused string warning
Update unit tests
Rendering inactive status in SessionInfoView
Adding comment with examples of some parametrized strings
Fix post rebase
Fixing wrong copyright title
Adding last seen details + fix observation of wrong deviceId in ViewModel
Adding learn more link in verification status details
Unit tests for computing trust level of device
Unit tests for GetCurrentSessionCrossSigningInfoUseCase
Updating existing unit tests
Navigation from other session item
Show info in overview screen
Renaming CurrentSessionView into SessionInfoView to be more generic
Introducing some reusable usecases
Adding unit tests for viewModel
Adding unit tests for mapper
Adding unit tests for the new use case
Adding use case to get full device info for a given device id
...
# Conflicts:
# library/ui-strings/src/main/res/values/strings.xml
# vector/src/main/AndroidManifest.xml
# vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.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/VectorSettingsDevicesViewNavigator.kt
* feature/ons/device_manager_current_session: (169 commits)
new app layouts invites (#6911)
bottom navigation tabs are removed for AppLayout (#6905)
focus input when changing server address
Fix copyright
Improve createRoomThreePidEvents for clarity
Remove roomCreatorUserId and use current userId by default
Remove useless explicit field type
Change visibility of LocalRoomThirdPartyInviteContent to internal
Remove useless apply in CreateLocalRoomStateEventsTask
Update doc
Extract condition to reduce code complexity
Verify tombstone event
Remove safe call
Add unit tests for CreateRoomFromLocalRoomTask
Add unit tests for CreateLocalRoomStateEventsTask
Set stateKey as empty by default
Create local room state events in dedicated task
Fix local events generation following the specification
Update CreateRoomParams from the potential FeaturePreset before persisting
Persists CreateRoomParams into LocalRoomSummaryEntity
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
* develop: (169 commits)
new app layouts invites (#6911)
bottom navigation tabs are removed for AppLayout (#6905)
focus input when changing server address
Fix copyright
Improve createRoomThreePidEvents for clarity
Remove roomCreatorUserId and use current userId by default
Remove useless explicit field type
Change visibility of LocalRoomThirdPartyInviteContent to internal
Remove useless apply in CreateLocalRoomStateEventsTask
Update doc
Extract condition to reduce code complexity
Verify tombstone event
Remove safe call
Add unit tests for CreateRoomFromLocalRoomTask
Add unit tests for CreateLocalRoomStateEventsTask
Set stateKey as empty by default
Create local room state events in dedicated task
Fix local events generation following the specification
Update CreateRoomParams from the potential FeaturePreset before persisting
Persists CreateRoomParams into LocalRoomSummaryEntity
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
Onuray Sahin
Maxime NATUREL
Benoit Marty
Eric Decanini
Jorge Martín
NIkita Fedrunov
Nikita Fedrunov
Adam Brown
sim
Benoit Marty
Florian Renaud