Remove observe2 (DEV) (#5842)

Co-authored-by: Alex Paulescu <alex.paulescu@gmail.com>
corona-warn-app · Feb 14, 2023 · 5eb552f · 5eb552f
1 parent 8b3002a
commit 5eb552f
Show file tree

Hide file tree

Showing 103 changed files with 275 additions and 392 deletions.
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragment.kt
@@ -9,7 +9,6 @@ import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.FragmentTestDeviceinfoBinding
 import de.rki.coronawarnapp.test.menu.ui.TestMenuItem
 import de.rki.coronawarnapp.util.di.AutoInject
-import de.rki.coronawarnapp.util.ui.observe2
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
@@ -26,11 +25,11 @@ class MiscInfoFragment : Fragment(R.layout.fragment_test_deviceinfo), AutoInject
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        vm.errorEvent.observe2(this) {
+        vm.errorEvent.observe(viewLifecycleOwner) {
             Snackbar.make(requireView(), it, Snackbar.LENGTH_INDEFINITE).show()
         }
 
-        vm.versionState.observe2(this) {
+        vm.versionState.observe(viewLifecycleOwner) {
             binding.googlePlayServicesVersionInfo.text = "Google Play Services: ${it.gmsVersion}"
             binding.exposureNotificationServiceVersionInfo.text = "Exposure Notification Services: ${it.enfVersion}"
         }

diff --git a/...src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt b/...src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt
@@ -9,7 +9,6 @@ import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.FragmentTestAppconfigBinding
 import de.rki.coronawarnapp.test.menu.ui.TestMenuItem
 import de.rki.coronawarnapp.util.di.AutoInject
-import de.rki.coronawarnapp.util.ui.observe2
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
@@ -33,7 +32,7 @@ class AppConfigTestFragment : Fragment(R.layout.fragment_test_appconfig), AutoIn
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        vm.currentConfig.observe2(this) { data ->
+        vm.currentConfig.observe(viewLifecycleOwner) { data ->
             binding.currentConfiguration.text = data.toString()
             binding.lastUpdate.text = timeFormatter.format(data.updatedAt)
             binding.timeOffset.text =
@@ -44,14 +43,14 @@ class AppConfigTestFragment : Fragment(R.layout.fragment_test_appconfig), AutoIn
                 """.trimIndent()
         }
 
-        vm.errorEvent.observe2(this) {
+        vm.errorEvent.observe(viewLifecycleOwner) {
             Toast.makeText(requireContext(), it.toString(), Toast.LENGTH_LONG).show()
         }
 
         binding.downloadAction.setOnClickListener { vm.download() }
         binding.deleteAction.setOnClickListener { vm.clearConfig() }
 
-        vm.isDeviceTimeFaked.observe2(this) {
+        vm.isDeviceTimeFaked.observe(viewLifecycleOwner) {
             binding.fakeCorrectDevicetimeToggle.isChecked = it
         }
         binding.fakeCorrectDevicetimeToggle.setOnClickListener {

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/ccl/CclTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/ccl/CclTestFragment.kt
@@ -14,7 +14,6 @@ import de.rki.coronawarnapp.databinding.FragmentTestCclBinding
 import de.rki.coronawarnapp.test.ccl.CclTestViewModel.ForceUpdateUiState.Loading
 import de.rki.coronawarnapp.test.menu.ui.TestMenuItem
 import de.rki.coronawarnapp.util.di.AutoInject
-import de.rki.coronawarnapp.util.ui.observe2
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
@@ -35,7 +34,7 @@ class CclTestFragment : Fragment(R.layout.fragment_test_ccl), AutoInject {
             calcDccWalletInfo.setOnClickListener { viewModel.triggerCalculation() }
             binding.forceUpdateCclConfiguration.setOnClickListener { viewModel.forceUpdateCclConfiguration() }
             clearDccWalletInfo.setOnClickListener { viewModel.clearDccWallet() }
-            viewModel.dccWalletInfoList.observe2(this@CclTestFragment) { infoList ->
+            viewModel.dccWalletInfoList.observe(viewLifecycleOwner) { infoList ->
                 dccWalletInfoList.text = buildSpannedString {
                     infoList.forEachIndexed { index, info ->
                         append("$index: ")

diff --git a/...viceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragment.kt b/...viceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragment.kt
@@ -11,7 +11,6 @@ import de.rki.coronawarnapp.test.menu.ui.TestMenuItem
 import de.rki.coronawarnapp.ui.durationpicker.DurationPicker
 import de.rki.coronawarnapp.ui.durationpicker.format
 import de.rki.coronawarnapp.util.di.AutoInject
-import de.rki.coronawarnapp.util.ui.observe2
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
@@ -32,12 +31,12 @@ class ContactDiaryTestFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        vm.locationVisits.observe2(this) {
+        vm.locationVisits.observe(viewLifecycleOwner) {
             binding.locationVisitsFancy.text = vm.getFancyLocationVisitString(it)
             binding.locationVisitsStatus.text = vm.getLocationVisitStatusString(it)
         }
 
-        vm.personEncounters.observe2(this) {
+        vm.personEncounters.observe(viewLifecycleOwner) {
             binding.personEncountersFancy.text = vm.getFancyPersonEncounterString(it)
             binding.personEncountersStatus.text = vm.getPersonEncounterStatusString(it)
         }

diff --git a/...eForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportDetailsFragment.kt b/...eForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportDetailsFragment.kt
@@ -7,7 +7,6 @@ import androidx.fragment.app.Fragment
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.FragmentSettingsCrashReportDetailsBinding
 import de.rki.coronawarnapp.util.di.AutoInject
-import de.rki.coronawarnapp.util.ui.observe2
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
@@ -25,12 +24,12 @@ class SettingsCrashReportDetailsFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        vm.selectedCrashReport.observe2(this) {
+        vm.selectedCrashReport.observe(viewLifecycleOwner) {
             fragmentSettingsCrashReportDetailsBinding.buttonCrashReportShare.visibility = View.VISIBLE
             fragmentSettingsCrashReportDetailsBinding.buttonCrashReportShare.setOnClickListener { shareCrashReport() }
         }
 
-        vm.selectedCrashReportFormattedText.observe2(this) {
+        vm.selectedCrashReportFormattedText.observe(viewLifecycleOwner) {
             fragmentSettingsCrashReportDetailsBinding.textViewCrashReportDetails.text = it
         }
     }

diff --git a/...c/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportFragment.kt b/...c/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportFragment.kt
@@ -9,7 +9,6 @@ import de.rki.coronawarnapp.bugreporting.event.BugEvent
 import de.rki.coronawarnapp.databinding.FragmentCrashreporterOverviewBinding
 import de.rki.coronawarnapp.test.menu.ui.TestMenuItem
 import de.rki.coronawarnapp.util.di.AutoInject
-import de.rki.coronawarnapp.util.ui.observe2
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
@@ -37,7 +36,7 @@ class SettingsCrashReportFragment : Fragment(R.layout.fragment_crashreporter_ove
         super.onViewCreated(view, savedInstanceState)
         fragmentCrashreporterOverviewBinding.list.adapter = adapter
 
-        vm.crashReports.observe2(this) {
+        vm.crashReports.observe(viewLifecycleOwner) {
             adapter.updateCrashReports(it)
         }
 

diff --git a/...viceForTesters/java/de/rki/coronawarnapp/test/datadonation/ui/DataDonationTestFragment.kt b/...viceForTesters/java/de/rki/coronawarnapp/test/datadonation/ui/DataDonationTestFragment.kt
@@ -18,7 +18,6 @@ import de.rki.coronawarnapp.test.menu.ui.TestMenuItem
 import de.rki.coronawarnapp.ui.dialog.displayDialog
 import de.rki.coronawarnapp.util.di.AutoInject
 import de.rki.coronawarnapp.util.tryHumanReadableError
-import de.rki.coronawarnapp.util.ui.observe2
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
@@ -36,13 +35,13 @@ class DataDonationTestFragment : Fragment(R.layout.fragment_test_datadonation),
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        vm.currentReport.observe2(this) {
+        vm.currentReport.observe(viewLifecycleOwner) {
             binding.safetynetBody.text = it?.body?.toString()?.let { json ->
                 JSONObject(json).toString(4)
             }
         }
 
-        vm.currentAnalyticsData.observe2(this) {
+        vm.currentAnalyticsData.observe(viewLifecycleOwner) {
             binding.analyticsBody.text = it.toString()
         }
 
@@ -54,7 +53,7 @@ class DataDonationTestFragment : Fragment(R.layout.fragment_test_datadonation),
             analyticsSubmit.setOnClickListener { vm.submitAnalytics() }
         }
 
-        vm.copyJWSEvent.observe2(this) { jws ->
+        vm.copyJWSEvent.observe(viewLifecycleOwner) { jws ->
             val intent = ShareCompat.IntentBuilder(requireActivity())
                 .setType("text/plain")
                 .setSubject("JWS")
@@ -63,7 +62,7 @@ class DataDonationTestFragment : Fragment(R.layout.fragment_test_datadonation),
             startActivity(intent)
         }
 
-        vm.copyAnalyticsEvent.observe2(this) { analytics ->
+        vm.copyAnalyticsEvent.observe(viewLifecycleOwner) { analytics ->
             val intent = ShareCompat.IntentBuilder(requireActivity())
                 .setType("text/plain")
                 .setSubject("Analytics")
@@ -72,14 +71,14 @@ class DataDonationTestFragment : Fragment(R.layout.fragment_test_datadonation),
             startActivity(intent)
         }
 
-        vm.infoEvents.observe2(this) {
+        vm.infoEvents.observe(viewLifecycleOwner) {
             Toast.makeText(requireContext(), it, Toast.LENGTH_LONG).show()
         }
 
-        vm.currentValidation.observe2(this) { items ->
+        vm.currentValidation.observe(viewLifecycleOwner) { items ->
             if (items?.first == null) {
                 binding.safetynetRequirementsBody.text = "No validation yet."
-                return@observe2
+                return@observe
             }
             binding.safetynetRequirementsBody.apply {
                 text = items.first.toString()
@@ -97,22 +96,22 @@ class DataDonationTestFragment : Fragment(R.layout.fragment_test_datadonation),
             safetynetRequirementsStrict.setOnClickListener { vm.validateSafetyNetStrict() }
         }
 
-        vm.lastAnalyticsData.observe2(this) {
+        vm.lastAnalyticsData.observe(viewLifecycleOwner) {
             binding.analyticsLastSubmitBody.text =
                 it?.toString() ?: "No analytics were successfully submitted until now"
         }
 
         vm.checkLastAnalytics()
 
-        vm.otp.observe2(this) {
+        vm.otp.observe(viewLifecycleOwner) {
             binding.oneTimePasswordBody.text = it.toString()
         }
 
-        vm.surveyConfig.observe2(this) {
+        vm.surveyConfig.observe(viewLifecycleOwner) {
             binding.surveyConfigBody.text = it
         }
 
-        vm.showErrorDialog.observe2(this) {
+        vm.showErrorDialog.observe(viewLifecycleOwner) {
             val humanReadableError = it.tryHumanReadableError(requireContext())
             displayDialog {
                 title(R.string.datadonation_details_survey_consent_error_dialog_title)
@@ -122,7 +121,7 @@ class DataDonationTestFragment : Fragment(R.layout.fragment_test_datadonation),
             }
         }
 
-        vm.currentSafetyNetExceptionType.observe2(this) { type ->
+        vm.currentSafetyNetExceptionType.observe(viewLifecycleOwner) { type ->
             binding.apply {
                 if (safetynetExceptionSimulationRadioGroup.childCount != SafetyNetException.Type.values().size) {
                     SafetyNetException.Type.values()
@@ -142,7 +141,7 @@ class DataDonationTestFragment : Fragment(R.layout.fragment_test_datadonation),
             safetynetExceptionSimulationButton.setOnClickListener { vm.showSafetyNetErrorDialog() }
         }
 
-        vm.currentSurveyExceptionType.observe2(this) { type ->
+        vm.currentSurveyExceptionType.observe(viewLifecycleOwner) { type ->
             binding.apply {
                 if (surveyExceptionSimulationRadioGroup.childCount != SurveyException.Type.values().size) {
                     SurveyException.Type.values()
@@ -162,7 +161,7 @@ class DataDonationTestFragment : Fragment(R.layout.fragment_test_datadonation),
             surveyExceptionSimulationButton.setOnClickListener { vm.showSurveyErrorDialog() }
         }
 
-        vm.isSafetyNetTimeCheckSkipped.observe2(this) {
+        vm.isSafetyNetTimeCheckSkipped.observe(viewLifecycleOwner) {
             binding.disableSafetynetToggle.isChecked = it
         }
 

diff --git a/...c/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt b/...c/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt
@@ -21,7 +21,6 @@ import de.rki.coronawarnapp.test.menu.ui.TestMenuItem
 import de.rki.coronawarnapp.ui.dialog.displayDialog
 import de.rki.coronawarnapp.util.ContextExtensions.getColorCompat
 import de.rki.coronawarnapp.util.di.AutoInject
-import de.rki.coronawarnapp.util.ui.observe2
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
@@ -62,7 +61,7 @@ class DebugOptionsFragment : Fragment(R.layout.fragment_test_debugoptions), Auto
             vm.clearLaunchEnvironment()
         }
 
-        vm.environmentState.observe2(this) { state ->
+        vm.environmentState.observe(viewLifecycleOwner) { state ->
             binding.apply {
 
                 buttonClear.isVisible = state.isOverwritten
@@ -100,7 +99,7 @@ class DebugOptionsFragment : Fragment(R.layout.fragment_test_debugoptions), Auto
                 environmentDccReissuanceServerUrl.text = "DccReissuanceServerUrl" styleTo state.dccReissuanceServerUrl
             }
         }
-        vm.environmentStateChange.observe2(this) {
+        vm.environmentStateChange.observe(viewLifecycleOwner) {
             showSnackBar("Environment changed to: $it\nForce stop & restart the app!")
         }
     }

diff --git a/.../deviceForTesters/java/de/rki/coronawarnapp/test/dsc/ui/DccStateValidationTestFragment.kt b/.../deviceForTesters/java/de/rki/coronawarnapp/test/dsc/ui/DccStateValidationTestFragment.kt
@@ -11,7 +11,6 @@ import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.FragmentTestStateValidationDccBinding
 import de.rki.coronawarnapp.test.menu.ui.TestMenuItem
 import de.rki.coronawarnapp.util.di.AutoInject
-import de.rki.coronawarnapp.util.ui.observe2
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
@@ -46,7 +45,7 @@ class DccStateValidationTestFragment : Fragment(R.layout.fragment_test_state_val
             refreshRevocationList.setOnClickListener { viewModel.refreshRevocationList() }
             clearRevocationList.setOnClickListener { viewModel.clearRevocationList() }
 
-            viewModel.dscData.observe2(this@DccStateValidationTestFragment) {
+            viewModel.dscData.observe(viewLifecycleOwner) {
                 infoText.text = buildSpannedString {
                     bold { append("Last update: ") }
                     appendLine(it.lastUpdate)
@@ -60,7 +59,7 @@ class DccStateValidationTestFragment : Fragment(R.layout.fragment_test_state_val
                 }
             }
 
-            viewModel.errorEvent.observe2(this@DccStateValidationTestFragment) {
+            viewModel.errorEvent.observe(viewLifecycleOwner) {
                 Toast.makeText(requireContext(), "Can't refresh List of DSCs", Toast.LENGTH_SHORT).show()
             }
         }

diff --git a/...deviceForTesters/java/de/rki/coronawarnapp/test/hometestcards/ui/HomeTestCardsFragment.kt b/...deviceForTesters/java/de/rki/coronawarnapp/test/hometestcards/ui/HomeTestCardsFragment.kt
@@ -13,7 +13,6 @@ import de.rki.coronawarnapp.ui.main.home.HomeAdapter
 import de.rki.coronawarnapp.util.di.AutoInject
 import de.rki.coronawarnapp.util.lists.decorations.TopBottomPaddingDecorator
 import de.rki.coronawarnapp.util.lists.diffutil.update
-import de.rki.coronawarnapp.util.ui.observe2
 import de.rki.coronawarnapp.util.ui.setCWAContentDescription
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
@@ -40,7 +39,7 @@ class HomeTestCardsFragment : Fragment(R.layout.fragment_test_home_test_cards_la
             adapter = homeAdapter
         }
 
-        viewModel.homeItems.observe2(this) {
+        viewModel.homeItems.observe(viewLifecycleOwner) {
             homeAdapter.update(it)
         }
     }

diff --git a/...deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyDownloadTestFragment.kt b/...deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyDownloadTestFragment.kt
@@ -12,7 +12,6 @@ import de.rki.coronawarnapp.diagnosiskeys.storage.CachedKeyInfo
 import de.rki.coronawarnapp.test.menu.ui.TestMenuItem
 import de.rki.coronawarnapp.util.di.AutoInject
 import de.rki.coronawarnapp.util.lists.diffutil.update
-import de.rki.coronawarnapp.util.ui.observe2
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
@@ -29,12 +28,12 @@ class KeyDownloadTestFragment : Fragment(R.layout.fragment_test_keydownload), Au
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        vm.fakeMeteredConnection.observe2(this) {
+        vm.fakeMeteredConnection.observe(viewLifecycleOwner) {
             binding.fakeMeteredConnectionToggle.isChecked = it
         }
         binding.fakeMeteredConnectionToggle.setOnClickListener { vm.toggleAllowMeteredConnections() }
 
-        vm.isMeteredConnection.observe2(this) {
+        vm.isMeteredConnection.observe(viewLifecycleOwner) {
             binding.infoMeteredNetwork.text = "Is metered network? $it"
         }
 
@@ -43,7 +42,7 @@ class KeyDownloadTestFragment : Fragment(R.layout.fragment_test_keydownload), Au
             clearAction.setOnClickListener { vm.clearDownloads() }
         }
 
-        vm.isSyncRunning.observe2(this) { isRunning ->
+        vm.isSyncRunning.observe(viewLifecycleOwner) { isRunning ->
             binding.apply {
                 downloadAction.isEnabled = !isRunning
                 clearAction.isEnabled = !isRunning
@@ -56,15 +55,15 @@ class KeyDownloadTestFragment : Fragment(R.layout.fragment_test_keydownload), Au
             layoutManager = LinearLayoutManager(requireContext())
         }
 
-        vm.currentCache.observe2(this) { items ->
+        vm.currentCache.observe(viewLifecycleOwner) { items ->
             val dayCount = items.count { it.info.type == CachedKeyInfo.Type.LOCATION_DAY }
             val hourCount = items.count { it.info.type == CachedKeyInfo.Type.LOCATION_HOUR }
             binding.cacheListInfos.text = "${items.size} files, $dayCount days, $hourCount hours."
 
             keyFileAdapter.update(items)
         }
 
-        vm.errorEvent.observe2(this) {
+        vm.errorEvent.observe(viewLifecycleOwner) {
             Snackbar.make(requireView(), it.toString(), Snackbar.LENGTH_LONG).show()
         }
     }

diff --git a/...-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragment.kt b/...-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragment.kt
@@ -9,7 +9,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.FragmentTestMenuBinding
 import de.rki.coronawarnapp.util.di.AutoInject
-import de.rki.coronawarnapp.util.ui.observe2
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
@@ -33,14 +32,14 @@ class TestMenuFragment : Fragment(R.layout.fragment_test_menu), AutoInject {
             adapter = menuAdapter
         }
 
-        vm.testMenuData.observe2(this) { menuAdapter.data = it }
+        vm.testMenuData.observe(viewLifecycleOwner) { menuAdapter.data = it }
         menuAdapter.onItemClickListener = { vm.showTestScreen(it) }
 
-        vm.showTestScreenEvent.observe2(this) {
+        vm.showTestScreenEvent.observe(viewLifecycleOwner) {
             findNavController().navigate(it.targetId)
         }
 
-        vm.personsCount.observe2(this) {
+        vm.personsCount.observe(viewLifecycleOwner) {
             binding.personsCount.text = "Persons count: ${it.first}\nCertificates: ${it.second}"
         }
     }