#100 Fix Checkstyle issues - upgrade tooling

kiwix · Feb 14, 2020 · 36e901c · 36e901c
1 parent d743430
commit 36e901c
Show file tree

Hide file tree

Showing 95 changed files with 221 additions and 199 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -4,6 +4,7 @@ end_of_line=lf
 insert_final_newline=true
 indent_style=space
 indent_size=2
+disabled_rules=import-ordering
 
 [{*.sht,*.html,*.shtm,*.shtml,*.htm}]
 indent_style=space

diff --git a/app/src/androidTest/java/DebugFunctions.kt b/app/src/androidTest/java/DebugFunctions.kt
@@ -24,8 +24,8 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
 import androidx.test.runner.lifecycle.Stage.RESUMED
 import androidx.viewpager.widget.ViewPager
-import org.kiwix.kiwixmobile.BaseRobot
 import java.io.File
+import org.kiwix.kiwixmobile.BaseRobot
 
 inline fun <reified T : BaseRobot> T.applyWithViewHierarchyPrinting(
   crossinline function: T.() -> Unit

diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/KiwixMockServer.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/KiwixMockServer.kt
@@ -18,13 +18,13 @@
 
 package org.kiwix.kiwixmobile
 
+import java.io.StringWriter
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.RecordedRequest
 import org.kiwix.sharedFunctions.TEST_PORT
 import org.simpleframework.xml.core.Persister
-import java.io.StringWriter
 
 class KiwixMockServer {
 

diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/components/TestComponent.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/components/TestComponent.kt
@@ -20,6 +20,7 @@ package org.kiwix.kiwixmobile.core.di.components
 import android.content.Context
 import dagger.BindsInstance
 import dagger.Component
+import javax.inject.Singleton
 import org.kiwix.kiwixmobile.NetworkTest
 import org.kiwix.kiwixmobile.ZimTest
 import org.kiwix.kiwixmobile.core.bookmark.BookmarksModule
@@ -30,7 +31,6 @@ import org.kiwix.kiwixmobile.core.di.modules.JNIModule
 import org.kiwix.kiwixmobile.core.di.modules.SearchModule
 import org.kiwix.kiwixmobile.core.di.modules.TestNetworkModule
 import org.kiwix.kiwixmobile.core.history.HistoryModule
-import javax.inject.Singleton
 
 /**
  * Created by mhutti1 on 13/04/17.

diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivityTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivityTest.kt
@@ -21,6 +21,7 @@ package org.kiwix.kiwixmobile.zim_manager
 import android.os.Build
 import androidx.test.filters.SdkSuppress
 import attempt
+import java.util.concurrent.TimeUnit.SECONDS
 import okhttp3.mockwebserver.MockResponse
 import org.junit.Ignore
 import org.junit.Test
@@ -33,7 +34,6 @@ import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
 import org.kiwix.sharedFunctions.book
 import org.kiwix.sharedFunctions.libraryNetworkEntity
 import org.kiwix.sharedFunctions.metaLinkNetworkEntity
-import java.util.concurrent.TimeUnit.SECONDS
 
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.JELLY_BEAN_MR2)
 class ZimManageActivityTest : BaseActivityTest<ZimManageActivity>() {

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/KiwixViewModelFactory.kt b/app/src/main/java/org/kiwix/kiwixmobile/KiwixViewModelFactory.kt
@@ -18,10 +18,10 @@
 package org.kiwix.kiwixmobile
 
 import androidx.lifecycle.ViewModel
-import org.kiwix.kiwixmobile.core.ViewModelFactory
-import org.kiwix.kiwixmobile.di.KiwixScope
 import javax.inject.Inject
 import javax.inject.Provider
+import org.kiwix.kiwixmobile.core.ViewModelFactory
+import org.kiwix.kiwixmobile.di.KiwixScope
 
 @KiwixScope
 class KiwixViewModelFactory @Inject constructor(

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/di/components/KiwixComponent.kt b/app/src/main/java/org/kiwix/kiwixmobile/di/components/KiwixComponent.kt
@@ -19,8 +19,8 @@
 package org.kiwix.kiwixmobile.di.components
 
 import dagger.Component
-import org.kiwix.kiwixmobile.di.KiwixScope
 import org.kiwix.kiwixmobile.core.di.components.CoreComponent
+import org.kiwix.kiwixmobile.di.KiwixScope
 import org.kiwix.kiwixmobile.di.components.ServiceComponent.Builder
 import org.kiwix.kiwixmobile.di.modules.KiwixModule
 import org.kiwix.kiwixmobile.di.modules.KiwixViewModelModule

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageActivity.kt
@@ -27,6 +27,7 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import io.reactivex.disposables.CompositeDisposable
+import javax.inject.Inject
 import kotlinx.android.synthetic.main.activity_language.language_progressbar
 import kotlinx.android.synthetic.main.activity_language.language_recycler_view
 import org.kiwix.kiwixmobile.R
@@ -46,7 +47,6 @@ import org.kiwix.kiwixmobile.language.viewmodel.State
 import org.kiwix.kiwixmobile.language.viewmodel.State.Content
 import org.kiwix.kiwixmobile.language.viewmodel.State.Loading
 import org.kiwix.kiwixmobile.language.viewmodel.State.Saving
-import javax.inject.Inject
 
 class LanguageActivity : BaseActivity() {
   override fun injection(coreComponent: CoreComponent) {

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/adapter/LanguageDelegate.kt b/app/src/main/java/org/kiwix/kiwixmobile/language/adapter/LanguageDelegate.kt
@@ -20,8 +20,8 @@ package org.kiwix.kiwixmobile.language.adapter
 
 import android.view.ViewGroup
 import org.kiwix.kiwixmobile.R
-import org.kiwix.kiwixmobile.core.extensions.ViewGroupExtensions.inflate
 import org.kiwix.kiwixmobile.core.base.adapter.AbsDelegateAdapter
+import org.kiwix.kiwixmobile.core.extensions.ViewGroupExtensions.inflate
 import org.kiwix.kiwixmobile.language.adapter.LanguageListItem.HeaderItem
 import org.kiwix.kiwixmobile.language.adapter.LanguageListItem.LanguageItem
 import org.kiwix.kiwixmobile.language.adapter.LanguageListViewHolder.HeaderViewHolder

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModel.kt b/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModel.kt
@@ -22,6 +22,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.processors.PublishProcessor
+import javax.inject.Inject
 import org.kiwix.kiwixmobile.core.base.SideEffect
 import org.kiwix.kiwixmobile.core.dao.NewLanguagesDao
 import org.kiwix.kiwixmobile.language.adapter.LanguageListItem.LanguageItem
@@ -32,7 +33,6 @@ import org.kiwix.kiwixmobile.language.viewmodel.Action.UpdateLanguages
 import org.kiwix.kiwixmobile.language.viewmodel.State.Content
 import org.kiwix.kiwixmobile.language.viewmodel.State.Loading
 import org.kiwix.kiwixmobile.language.viewmodel.State.Saving
-import javax.inject.Inject
 
 class LanguageViewModel @Inject constructor(
   private val languageDao: NewLanguagesDao

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/SaveLanguagesAndFinish.kt b/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/SaveLanguagesAndFinish.kt
@@ -20,9 +20,9 @@ package org.kiwix.kiwixmobile.language.viewmodel
 import androidx.appcompat.app.AppCompatActivity
 import io.reactivex.Flowable
 import io.reactivex.schedulers.Schedulers
+import org.kiwix.kiwixmobile.core.base.SideEffect
 import org.kiwix.kiwixmobile.core.dao.NewLanguagesDao
 import org.kiwix.kiwixmobile.core.zim_manager.Language
-import org.kiwix.kiwixmobile.core.base.SideEffect
 
 data class SaveLanguagesAndFinish(
   val languages: List<Language>,

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
@@ -24,6 +24,7 @@ import android.util.Log
 import android.widget.Toast
 import androidx.core.net.toFile
 import androidx.core.net.toUri
+import java.io.File
 import org.json.JSONArray
 import org.kiwix.kiwixmobile.R
 import org.kiwix.kiwixmobile.core.di.components.CoreComponent
@@ -45,7 +46,6 @@ import org.kiwix.kiwixmobile.core.utils.files.FileUtils
 import org.kiwix.kiwixmobile.kiwixActivityComponent
 import org.kiwix.kiwixmobile.webserver.ZimHostActivity
 import org.kiwix.kiwixmobile.zim_manager.ZimManageActivity
-import java.io.File
 
 class KiwixMainActivity : CoreMainActivity() {
 

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixPrefsFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixPrefsFragment.kt
@@ -20,10 +20,10 @@ package org.kiwix.kiwixmobile.settings
 
 import android.os.Bundle
 import android.os.Environment
+import java.io.File
 import org.kiwix.kiwixmobile.core.settings.CorePrefsFragment
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil.PREF_LANG
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil.PREF_STORAGE
-import java.io.File
 
 class KiwixPrefsFragment : CorePrefsFragment() {
   override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.kt
@@ -31,6 +31,8 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.widget.Toolbar
 import androidx.recyclerview.widget.RecyclerView
+import java.util.ArrayList
+import javax.inject.Inject
 import org.kiwix.kiwixmobile.R
 import org.kiwix.kiwixmobile.core.BuildConfig
 import org.kiwix.kiwixmobile.core.base.BaseActivity
@@ -49,8 +51,6 @@ import org.kiwix.kiwixmobile.webserver.wifi_hotspot.HotspotService
 import org.kiwix.kiwixmobile.webserver.wifi_hotspot.HotspotService.ACTION_CHECK_IP_ADDRESS
 import org.kiwix.kiwixmobile.webserver.wifi_hotspot.HotspotService.ACTION_START_SERVER
 import org.kiwix.kiwixmobile.webserver.wifi_hotspot.HotspotService.ACTION_STOP_SERVER
-import java.util.ArrayList
-import javax.inject.Inject
 
 class ZimHostActivity : BaseActivity(), ZimHostCallbacks, ZimHostContract.View {
   @Inject

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostPresenter.kt b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostPresenter.kt
@@ -20,13 +20,13 @@ package org.kiwix.kiwixmobile.webserver
 import android.util.Log
 import io.reactivex.SingleObserver
 import io.reactivex.disposables.Disposable
+import javax.inject.Inject
 import org.kiwix.kiwixmobile.core.base.BasePresenter
 import org.kiwix.kiwixmobile.core.data.DataSource
 import org.kiwix.kiwixmobile.core.di.ActivityScope
 import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem
 import org.kiwix.kiwixmobile.webserver.ZimHostContract.Presenter
 import org.kiwix.kiwixmobile.webserver.ZimHostContract.View
-import javax.inject.Inject
 
 @ActivityScope
 class ZimHostPresenter @Inject internal constructor(private val dataSource: DataSource) :

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/wifi_hotspot/HotspotStateReceiver.kt b/app/src/main/java/org/kiwix/kiwixmobile/webserver/wifi_hotspot/HotspotStateReceiver.kt
@@ -19,9 +19,9 @@ package org.kiwix.kiwixmobile.webserver.wifi_hotspot
 
 import android.content.Context
 import android.content.Intent
+import javax.inject.Inject
 import org.kiwix.kiwixmobile.core.base.BaseBroadcastReceiver
 import org.kiwix.kiwixmobile.webserver.wifi_hotspot.HotspotStateReceiver.HotspotState.DISABLED
-import javax.inject.Inject
 
 const val EXTRA_WIFI_AP_STATE = "wifi_state"
 const val ACTION_WIFI_AP_STATE = "android.net.wifi.WIFI_AP_STATE_CHANGED"

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ConnectivityBroadcastReceiver.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ConnectivityBroadcastReceiver.kt
@@ -23,9 +23,9 @@ import android.content.Intent
 import android.net.ConnectivityManager
 import io.reactivex.Flowable
 import io.reactivex.processors.BehaviorProcessor
+import javax.inject.Inject
 import org.kiwix.kiwixmobile.core.base.BaseBroadcastReceiver
 import org.kiwix.kiwixmobile.networkState
-import javax.inject.Inject
 
 class ConnectivityBroadcastReceiver @Inject constructor(
   private val connectivityManager: ConnectivityManager

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/DefaultLanguageProvider.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/DefaultLanguageProvider.kt
@@ -19,8 +19,8 @@
 package org.kiwix.kiwixmobile.zim_manager
 
 import android.content.Context
-import org.kiwix.kiwixmobile.core.zim_manager.Language
 import javax.inject.Inject
+import org.kiwix.kiwixmobile.core.zim_manager.Language
 
 class DefaultLanguageProvider @Inject constructor(private val context: Context) {
   fun provide() = Language(

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/Fat32Checker.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/Fat32Checker.kt
@@ -22,6 +22,7 @@ import io.reactivex.Flowable
 import io.reactivex.functions.BiFunction
 import io.reactivex.processors.BehaviorProcessor
 import io.reactivex.schedulers.Schedulers
+import java.io.File
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
 import org.kiwix.kiwixmobile.zim_manager.Fat32Checker.FileSystemState.CanWrite4GbFile
 import org.kiwix.kiwixmobile.zim_manager.Fat32Checker.FileSystemState.CannotWrite4GbFile
@@ -30,7 +31,6 @@ import org.kiwix.kiwixmobile.zim_manager.Fat32Checker.FileSystemState.Unknown
 import org.kiwix.kiwixmobile.zim_manager.FileSystemCapability.CANNOT_WRITE_4GB
 import org.kiwix.kiwixmobile.zim_manager.FileSystemCapability.CAN_WRITE_4GB
 import org.kiwix.kiwixmobile.zim_manager.FileSystemCapability.INCONCLUSIVE
-import java.io.File
 
 class Fat32Checker constructor(
   sharedPreferenceUtil: SharedPreferenceUtil,

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/FileWritingFileSystemChecker.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/FileWritingFileSystemChecker.kt
@@ -19,10 +19,10 @@
 package org.kiwix.kiwixmobile.zim_manager
 
 import android.util.Log
-import org.kiwix.kiwixmobile.zim_manager.FileSystemCapability.CANNOT_WRITE_4GB
-import org.kiwix.kiwixmobile.zim_manager.FileSystemCapability.CAN_WRITE_4GB
 import java.io.File
 import java.io.RandomAccessFile
+import org.kiwix.kiwixmobile.zim_manager.FileSystemCapability.CANNOT_WRITE_4GB
+import org.kiwix.kiwixmobile.zim_manager.FileSystemCapability.CAN_WRITE_4GB
 
 class FileWritingFileSystemChecker : FileSystemChecker {
   override fun checkFilesystemSupports4GbFiles(path: String): FileSystemCapability {

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/MountFileSystemChecker.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/MountFileSystemChecker.kt
@@ -18,10 +18,10 @@
 
 package org.kiwix.kiwixmobile.zim_manager
 
+import java.io.File
 import org.kiwix.kiwixmobile.zim_manager.FileSystemCapability.CANNOT_WRITE_4GB
 import org.kiwix.kiwixmobile.zim_manager.FileSystemCapability.CAN_WRITE_4GB
 import org.kiwix.kiwixmobile.zim_manager.FileSystemCapability.INCONCLUSIVE
-import java.io.File
 
 class MountFileSystemChecker : FileSystemChecker {
   override fun checkFilesystemSupports4GbFiles(path: String) =

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/SectionsPagerAdapter.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/SectionsPagerAdapter.kt
@@ -20,11 +20,11 @@ package org.kiwix.kiwixmobile.zim_manager
 import android.content.Context
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
+import kotlin.reflect.KFunction0
 import org.kiwix.kiwixmobile.core.R.string
 import org.kiwix.kiwixmobile.core.base.BaseFragment
 import org.kiwix.kiwixmobile.zim_manager.fileselect_view.ZimFileSelectFragment
 import org.kiwix.kiwixmobile.zim_manager.library_view.LibraryFragment
-import kotlin.reflect.KFunction0
 
 class SectionsPagerAdapter(
   private val context: Context,

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.kt
@@ -24,6 +24,7 @@ import android.view.MenuItem
 import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.Toolbar
 import androidx.lifecycle.ViewModelProvider
+import javax.inject.Inject
 import kotlinx.android.synthetic.main.zim_manager.manageViewPager
 import kotlinx.android.synthetic.main.zim_manager.tabs
 import org.kiwix.kiwixmobile.R
@@ -37,7 +38,6 @@ import org.kiwix.kiwixmobile.core.utils.SimpleTextListener
 import org.kiwix.kiwixmobile.kiwixActivityComponent
 import org.kiwix.kiwixmobile.language.LanguageActivity
 import org.kiwix.kiwixmobile.local_file_transfer.LocalFileTransferActivity
-import javax.inject.Inject
 
 class ZimManageActivity : BaseActivity() {
   override fun injection(coreComponent: CoreComponent) {

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt
@@ -30,6 +30,11 @@ import io.reactivex.functions.Function6
 import io.reactivex.processors.BehaviorProcessor
 import io.reactivex.processors.PublishProcessor
 import io.reactivex.schedulers.Schedulers
+import java.util.LinkedList
+import java.util.Locale
+import java.util.concurrent.TimeUnit.MILLISECONDS
+import java.util.concurrent.TimeUnit.SECONDS
+import javax.inject.Inject
 import org.kiwix.kiwixmobile.core.R
 import org.kiwix.kiwixmobile.core.StorageObserver
 import org.kiwix.kiwixmobile.core.base.SideEffect
@@ -68,11 +73,6 @@ import org.kiwix.kiwixmobile.zim_manager.library_view.adapter.LibraryListItem
 import org.kiwix.kiwixmobile.zim_manager.library_view.adapter.LibraryListItem.BookItem
 import org.kiwix.kiwixmobile.zim_manager.library_view.adapter.LibraryListItem.DividerItem
 import org.kiwix.kiwixmobile.zim_manager.library_view.adapter.LibraryListItem.LibraryDownloadItem
-import java.util.LinkedList
-import java.util.Locale
-import java.util.concurrent.TimeUnit.MILLISECONDS
-import java.util.concurrent.TimeUnit.SECONDS
-import javax.inject.Inject
 
 class ZimManageViewModel @Inject constructor(
   private val downloadDao: FetchDownloadDao,

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt
@@ -105,9 +105,9 @@ class ZimFileSelectFragment : BaseFragment() {
       layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
       setHasFixedSize(true)
     }
-    zimManageViewModel.fileSelectListStates.observe(this, Observer(::render))
+    zimManageViewModel.fileSelectListStates.observe(viewLifecycleOwner, Observer(::render))
     disposable.add(sideEffects())
-    zimManageViewModel.deviceListIsRefreshing.observe(this, Observer {
+    zimManageViewModel.deviceListIsRefreshing.observe(viewLifecycleOwner, Observer {
       zim_swiperefresh.isRefreshing = it!!
     })
     if (savedInstanceState != null && savedInstanceState.getBoolean(WAS_IN_ACTION_MODE)) {

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
@@ -19,6 +19,7 @@
 package org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects
 
 import androidx.appcompat.app.AppCompatActivity
+import javax.inject.Inject
 import org.kiwix.kiwixmobile.R
 import org.kiwix.kiwixmobile.core.base.SideEffect
 import org.kiwix.kiwixmobile.core.dao.NewBookDao
@@ -29,7 +30,6 @@ import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteZim
 import org.kiwix.kiwixmobile.core.utils.files.FileUtils
 import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem.BookOnDisk
 import org.kiwix.kiwixmobile.zim_manager.ZimManageActivity
-import javax.inject.Inject
 
 data class DeleteFiles(private val booksOnDiskListItem: List<BookOnDisk>) :
   SideEffect<Unit> {

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.kt
@@ -116,11 +116,11 @@ class LibraryFragment : BaseFragment() {
       layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
       setHasFixedSize(true)
     }
-    zimManageViewModel.libraryItems.observe(this, Observer(::onLibraryItemsChange))
+    zimManageViewModel.libraryItems.observe(viewLifecycleOwner, Observer(::onLibraryItemsChange))
     zimManageViewModel.libraryListIsRefreshing.observe(
-      this, Observer(::onRefreshStateChange)
+      viewLifecycleOwner, Observer(::onRefreshStateChange)
     )
-    zimManageViewModel.networkStates.observe(this, Observer(::onNetworkStateChange))
+    zimManageViewModel.networkStates.observe(viewLifecycleOwner, Observer(::onNetworkStateChange))
   }
 
   private fun onRefreshStateChange(isRefreshing: Boolean?) {

diff --git a/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModelTest.kt b/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModelTest.kt
@@ -39,9 +39,9 @@ import org.kiwix.kiwixmobile.language.viewmodel.State.Content
 import org.kiwix.kiwixmobile.language.viewmodel.State.Loading
 import org.kiwix.kiwixmobile.language.viewmodel.State.Saving
 import org.kiwix.sharedFunctions.InstantExecutorExtension
+import org.kiwix.sharedFunctions.language
 import org.kiwix.sharedFunctions.resetSchedulers
 import org.kiwix.sharedFunctions.setScheduler
-import org.kiwix.sharedFunctions.language
 
 fun languageItem(language: Language = language()) =
   LanguageListItem.LanguageItem(language)

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
@@ -28,6 +28,8 @@ import io.reactivex.Single
 import io.reactivex.processors.BehaviorProcessor
 import io.reactivex.processors.PublishProcessor
 import io.reactivex.schedulers.TestScheduler
+import java.util.Locale
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Nested
@@ -75,8 +77,6 @@ import org.kiwix.sharedFunctions.language
 import org.kiwix.sharedFunctions.libraryNetworkEntity
 import org.kiwix.sharedFunctions.resetSchedulers
 import org.kiwix.sharedFunctions.setScheduler
-import java.util.Locale
-import java.util.concurrent.TimeUnit.MILLISECONDS
 
 @ExtendWith(InstantExecutorExtension::class)
 class ZimManageViewModelTest {