Commit graph

11423 commits

Author SHA1 Message Date
Onuray Sahin
643f99b8e0 Merge branch 'feature/mna/clean-vm-for-dm-v2' into feature/ons/device_manager_filter
* 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
2022-09-07 18:31:30 +03:00
Benoit Marty
59e6fa98c9
Merge pull request #7000 from pt2121/pt/6529-room
Suggest @room when @channel, @everyone, or @here is typed in composer
2022-09-07 15:49:18 +02:00
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
Benoit Marty
a5046d43c8 Fix ReleaseNotesActivity displayed after login.
Ensure the state is up to date, when we will request it later with withState{}
2022-09-07 14:51:37 +02:00
ericdecanini
3b2fa0d563 Merge remote-tracking branch 'origin/develop' into bugfix/eric/new-layout-open-invite 2022-09-07 14:03:54 +02:00
ericdecanini
4a31dc403f Removes unused import 2022-09-07 14:03:48 +02:00
ericdecanini
37b216393e Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs 2022-09-07 14:02:10 +02:00
Benoit Marty
bdfbbbb2e6
Merge pull request #7020 from vector-im/feature/nfe/app_layout_all_screens_test
fixed allscreens sanity test for enabled app layout flag
2022-09-07 13:57:17 +02:00
ericdecanini
3c6efd673e Allows you to open an invite by clicking the invite cell 2022-09-07 11:58:47 +02:00
Benoit Marty
c408621bd5
Merge pull request #7054 from vector-im/feature/bma/fix_invite_to_room_in_space
Fix invite to room in space
2022-09-07 11:53:34 +02:00
Benoit Marty
80507dac00
Merge pull request #7024 from vector-im/bugfix/eric/new-layout-recents-padding
New Layout - Fixes padding of recents item selectable background
2022-09-07 11:00:36 +02:00
Benoit Marty
199195dcbd
Merge pull request #7039 from vector-im/feature/eric/new-layout-update-icons
New Layout - Replace space icon (and release notes image)
2022-09-07 10:57:23 +02:00
ericdecanini
64c8789ef2 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs 2022-09-07 10:35:44 +02:00
Eric Decanini
da88b37ec7
Merge pull request #7040 from vector-im/bugfix/eric/new-layout-missing-header
New Layout - Adds missing space list header
2022-09-07 10:31:31 +02:00
Benoit Marty
2ba00b3845 If we need the FragmentManager, let's require to have a FragmentActivity. 2022-09-07 10:14:29 +02:00
Benoit Marty
fe484e84f4 Fix clicking on invite does not work. Fix #7053
We need the FragmentManager to display a bottom sheet.
2022-09-07 10:01:31 +02:00
Maxime NATUREL
2592bc3772 RefreshDevicesOnCryptoDevicesChangeUseCase unit tests 2022-09-07 09:44:48 +02:00
Maxime NATUREL
c65bbd91d9 Fix some coding style issues 2022-09-07 09:44:43 +02:00
Maxime NATUREL
88a5c42a4a DevicesViewModel unit tests 2022-09-07 09:44:40 +02:00
Maxime NATUREL
6394c7efde GetDeviceFullInfoListUseCase unit tests 2022-09-07 09:44:37 +02:00
Maxime NATUREL
7511d21a6f GetCurrentSessionCrossSigningInfoUseCase unit tests 2022-09-07 09:44:34 +02:00
Maxime NATUREL
32f7767aa5 RefreshDevicesUseCase unit tests 2022-09-07 09:44:30 +02:00
Maxime NATUREL
07df58f4df Updating existing unit tests 2022-09-07 09:44:27 +02:00
Maxime NATUREL
69cb5738a4 Listen verification + refresh devices use cases 2022-09-07 09:44:24 +02:00
Maxime NATUREL
fa1ef06952 Moving recently created use cases inside v2 package 2022-09-07 09:44:21 +02:00
Maxime NATUREL
3a73e72b16 Inject new ViewModel in the fragment V2 + add use cases 2022-09-07 09:44:18 +02:00
Maxime NATUREL
801eef3ce7 Declare MarkAsManuallyVerified action 2022-09-07 09:44:14 +02:00
Maxime NATUREL
7248692273 Empty ViewModel V2 2022-09-07 09:44:09 +02:00
Benoit Marty
c5d3eaffb9
Merge pull request #7041 from vector-im/feature/bma/debug_release_note
Debug release note
2022-09-07 09:40:48 +02:00
Maxime NATUREL
2148270773 Update unit tests 2022-09-07 09:32:48 +02:00
Maxime NATUREL
6e9b2baf6f Rendering inactive status in SessionInfoView 2022-09-07 09:32:48 +02:00
Maxime NATUREL
52d05b373c Fix post rebase 2022-09-07 09:32:47 +02:00
Maxime NATUREL
1ad585e154 Adding last seen details + fix observation of wrong deviceId in ViewModel 2022-09-07 09:32:47 +02:00
Maxime NATUREL
d12bb09273 Adding learn more link in verification status details 2022-09-07 09:32:47 +02:00
Maxime NATUREL
fde7072bc7 Unit tests for computing trust level of device 2022-09-07 09:32:47 +02:00
Maxime NATUREL
38a04c3655 Unit tests for GetCurrentSessionCrossSigningInfoUseCase 2022-09-07 09:32:47 +02:00
Maxime NATUREL
3f30cf0bee Updating existing unit tests 2022-09-07 09:32:47 +02:00
Maxime NATUREL
78c2b10b89 Navigation from other session item 2022-09-07 09:32:47 +02:00
Maxime NATUREL
f4865df50c Show info in overview screen 2022-09-07 09:32:47 +02:00
Maxime NATUREL
52006c1bb4 Renaming CurrentSessionView into SessionInfoView to be more generic 2022-09-07 09:32:47 +02:00
Maxime NATUREL
a5ee4faef4 Introducing some reusable usecases 2022-09-07 09:32:47 +02:00
Maxime NATUREL
b995f798f9 Adding unit tests for viewModel 2022-09-07 09:32:47 +02:00
Maxime NATUREL
0c3310dd16 Adding unit tests for the new use case 2022-09-07 09:32:47 +02:00
Maxime NATUREL
68f106efac Adding use case to get full device info for a given device id 2022-09-07 09:32:47 +02:00
Maxime NATUREL
2a599d9760 Small renamings/reorganization in CryptoService 2022-09-07 09:32:47 +02:00
Maxime NATUREL
3eb29b4661 Renaming view state 2022-09-07 09:32:47 +02:00
Maxime NATUREL
26dbd31717 Unit tests for navigator 2022-09-07 09:32:47 +02:00
Maxime NATUREL
ebf707dca9 Navigation from current session 2022-09-07 09:32:45 +02:00
Maxime NATUREL
969663786b Renaming header list view to be consistent 2022-09-07 09:32:09 +02:00
ericdecanini
afbb76f341 Fixes lint error 2022-09-07 08:36:52 +02:00