From ff573651a91c7140cfdb822a7a077c43e97ff7b5 Mon Sep 17 00:00:00 2001 From: Gouri Panda Date: Sat, 19 Jun 2021 07:31:58 -0700 Subject: [PATCH] code clean up --- .../kiwixmobile/zim_manager/ZimManageViewModelTest.kt | 2 +- .../search/viewmodel/effects/ProcessActivityResult.kt | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt b/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt index 8b7aef707..ec345cdb8 100644 --- a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt +++ b/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt @@ -128,7 +128,7 @@ class ZimManageViewModelTest { every { connectivityBroadcastReceiver.networkStates } returns networkStates every { application.registerReceiver(any(), any()) } returns mockk() every { dataSource.booksOnDiskAsListItems() } returns booksOnDiskListItems - every { connectivityManager.activeNetworkInfo.type } returns ConnectivityManager.TYPE_WIFI + every { connectivityManager.activeNetworkInfo?.type } returns ConnectivityManager.TYPE_WIFI viewModel = ZimManageViewModel( downloadDao, newBookDao, diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/ProcessActivityResult.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/ProcessActivityResult.kt index d7bb3f421..53da4d35a 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/ProcessActivityResult.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/ProcessActivityResult.kt @@ -38,12 +38,9 @@ data class ProcessActivityResult( resultCode == Activity.RESULT_OK && data != null ) { - val extraResults = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS) - if (extraResults != null) { - val firstResults = extraResults.firstOrNull() - if (firstResults != null) { - actions.offer(Filter(firstResults)) - } + val results = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS) + if (results != null && results.first() != null) { + actions.offer(Filter(results.first())) } } }