Onuray Sahin 8dcbd3710d Merge branch 'feature/mna/session-overview-screen' into feature/ons/device_manager_filter ... * 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		2022-09-07 16:33:35 +03:00
..
androidTest/java/im/vector/app	Fix voice recording tests	2022-09-06 20:08:29 +02:00
debug	Use @AndroidEntryPoint for all Fragment	2022-08-23 18:49:16 +02:00
fdroid	using american english for consistency	2022-08-11 09:32:36 +01:00
gplay/java/im/vector/app	merging with develop	2022-08-31 09:16:01 +01:00
main	Merge branch 'feature/mna/session-overview-screen' into feature/ons/device_manager_filter	2022-09-07 16:33:35 +03:00
nightly/res/xml	Add sources for nightly. Use release version, change AnalyticsConfig.kt and shortcuts.xml.	2022-07-06 15:37:21 +02:00
release	Merge pull request #6792 from vector-im/feature/mna/enable-leakcanary	2022-08-11 12:10:26 +02:00
sharedTest/java/im/vector/app/test/shared
test/java	Update unit tests	2022-09-07 09:32:48 +02:00