From e75c5a6b9adf5e748331131bb51e4f30abb7c7ad Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Mon, 1 Nov 2021 12:35:09 +0000 Subject: [PATCH 1/3] adding missing view model provision --- .../java/im/vector/app/core/di/MavericksViewModelModule.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt index 5637c97b51..f1ff55f765 100644 --- a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt +++ b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt @@ -80,6 +80,7 @@ import im.vector.app.features.settings.devices.DevicesViewModel import im.vector.app.features.settings.devtools.AccountDataViewModel import im.vector.app.features.settings.devtools.GossipingEventsPaperTrailViewModel import im.vector.app.features.settings.devtools.KeyRequestListViewModel +import im.vector.app.features.settings.devtools.KeyRequestViewModel import im.vector.app.features.settings.homeserver.HomeserverSettingsViewModel import im.vector.app.features.settings.ignored.IgnoredUsersViewModel import im.vector.app.features.settings.locale.LocalePickerViewModel @@ -341,6 +342,11 @@ interface MavericksViewModelModule { @MavericksViewModelKey(KeyRequestListViewModel::class) fun keyRequestListViewModelFactory(factory: KeyRequestListViewModel.Factory): MavericksAssistedViewModelFactory<*, *> + @Binds + @IntoMap + @MavericksViewModelKey(KeyRequestViewModel::class) + fun keyRequestViewModelFactory(factory: KeyRequestViewModel.Factory): MavericksAssistedViewModelFactory<*, *> + @Binds @IntoMap @MavericksViewModelKey(CrossSigningSettingsViewModel::class) From 3e982601aca67e80c82863247e52ec6fe17dc1cf Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Mon, 1 Nov 2021 12:37:33 +0000 Subject: [PATCH 2/3] adding changelog entry --- changelog.d/4380.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4380.bugfix diff --git a/changelog.d/4380.bugfix b/changelog.d/4380.bugfix new file mode 100644 index 0000000000..3c6a589a29 --- /dev/null +++ b/changelog.d/4380.bugfix @@ -0,0 +1 @@ +Fixes crash when launching the key request dev tools screen \ No newline at end of file From da3372af96c70e9673ef178859524ae238a5e2d3 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 2 Nov 2021 09:00:36 +0000 Subject: [PATCH 3/3] removing changelog entry the crash had not been included in a released build --- changelog.d/4380.bugfix | 1 - 1 file changed, 1 deletion(-) delete mode 100644 changelog.d/4380.bugfix diff --git a/changelog.d/4380.bugfix b/changelog.d/4380.bugfix deleted file mode 100644 index 3c6a589a29..0000000000 --- a/changelog.d/4380.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixes crash when launching the key request dev tools screen \ No newline at end of file