Specify LazyThreadSafetyMode for inject and viewModel delegates

app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt

@@ -14,7 +14,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 	PreferenceFragmentCompat(), OnApplyWindowInsetsListener {
 
-	protected val settings by inject<AppSettings>()
+	protected val settings by inject<AppSettings>(mode = LazyThreadSafetyMode.NONE)
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)

app/src/main/java/org/koitharu/kotatsu/browser/BrowserClient.kt

@@ -11,7 +11,7 @@ import org.koitharu.kotatsu.core.network.WebViewClientCompat
 
 class BrowserClient(private val callback: BrowserCallback) : WebViewClientCompat(), KoinComponent {
 
-	private val okHttp by inject<OkHttpClient>()
+	private val okHttp by inject<OkHttpClient>(mode = LazyThreadSafetyMode.SYNCHRONIZED)
 
 	override fun onPageFinished(webView: WebView, url: String) {
 		super.onPageFinished(webView, url)

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt

@@ -41,7 +41,7 @@ import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 class DetailsActivity : BaseActivity<ActivityDetailsBinding>(),
 	TabLayoutMediator.TabConfigurationStrategy {
 
-	private val viewModel by viewModel<DetailsViewModel> {
+	private val viewModel by viewModel<DetailsViewModel>(mode = LazyThreadSafetyMode.NONE) {
 		parametersOf(MangaIntent.from(intent))
 	}
 

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt

@@ -35,7 +35,7 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
 	View.OnLongClickListener {
 
 	private val viewModel by sharedViewModel<DetailsViewModel>()
-	private val coil by inject<ImageLoader>()
+	private val coil by inject<ImageLoader>(mode = LazyThreadSafetyMode.NONE)
 	private var tagsJob: Job? = null
 
 	override fun onInflateView(

app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt

@@ -27,7 +27,9 @@ class FavouritesContainerFragment : BaseFragment<FragmentFavouritesBinding>(),
 
 	override val recycledViewPool = RecyclerView.RecycledViewPool()
 
-	private val viewModel by viewModel<FavouritesCategoriesViewModel>()
+	private val viewModel by viewModel<FavouritesCategoriesViewModel>(
+		mode = LazyThreadSafetyMode.NONE
+	)
 	private val editDelegate by lazy(LazyThreadSafetyMode.NONE) {
 		CategoriesEditDelegate(requireContext(), this)
 	}

app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt

@@ -28,7 +28,9 @@ class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
 	OnListItemClickListener<FavouriteCategory>,
 	View.OnClickListener, CategoriesEditDelegate.CategoriesEditCallback {
 
-	private val viewModel by viewModel<FavouritesCategoriesViewModel>()
+	private val viewModel by viewModel<FavouritesCategoriesViewModel>(
+		mode = LazyThreadSafetyMode.NONE
+	)
 
 	private lateinit var adapter: CategoriesAdapter
 	private lateinit var reorderHelper: ItemTouchHelper

app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt

@@ -25,7 +25,7 @@ class FavouriteCategoriesDialog : BaseBottomSheet<DialogFavoriteCategoriesBindin
 	OnListItemClickListener<MangaCategoryItem>, CategoriesEditDelegate.CategoriesEditCallback,
 	View.OnClickListener {
 
-	private val viewModel by viewModel<MangaCategoriesViewModel> {
+	private val viewModel by viewModel<MangaCategoriesViewModel>(mode = LazyThreadSafetyMode.NONE) {
 		parametersOf(requireNotNull(arguments?.getParcelable<Manga>(MangaIntent.KEY_MANGA)))
 	}
 

app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt

@@ -12,7 +12,7 @@ import org.koitharu.kotatsu.utils.ext.withArgs
 
 class FavouritesListFragment : MangaListFragment() {
 
-	override val viewModel by viewModel<FavouritesListViewModel> {
+	override val viewModel by viewModel<FavouritesListViewModel>(mode = LazyThreadSafetyMode.NONE) {
 		parametersOf(categoryId)
 	}
 

app/src/main/java/org/koitharu/kotatsu/history/domain/HistoryRepository.kt

@@ -6,8 +6,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
@@ -18,9 +16,10 @@ import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.ext.mapItems
 import org.koitharu.kotatsu.utils.ext.mapToSet
 
-class HistoryRepository(private val db: MangaDatabase) : KoinComponent {
-
-	private val trackingRepository by inject<TrackingRepository>()
+class HistoryRepository(
+	private val db: MangaDatabase,
+	private val trackingRepository: TrackingRepository,
+) {
 
 	suspend fun getList(offset: Int, limit: Int = 20): List<Manga> {
 		val entities = db.historyDao.findAll(offset, limit)

app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt

@@ -15,7 +15,7 @@ import org.koitharu.kotatsu.utils.ext.ellipsize
 
 class HistoryListFragment : MangaListFragment() {
 
-	override val viewModel by viewModel<HistoryListViewModel>()
+	override val viewModel by viewModel<HistoryListViewModel>(mode = LazyThreadSafetyMode.NONE)
 	override val isSwipeRefreshEnabled = false
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/java/org/koitharu/kotatsu/list/ui/ListModeSelectDialog.kt

@@ -18,7 +18,7 @@ import org.koitharu.kotatsu.databinding.DialogListModeBinding
 class ListModeSelectDialog : AlertDialogFragment<DialogListModeBinding>(), View.OnClickListener,
 	SeekBar.OnSeekBarChangeListener {
 
-	private val settings by inject<AppSettings>()
+	private val settings by inject<AppSettings>(mode = LazyThreadSafetyMode.NONE)
 
 	private var mode: ListMode = ListMode.GRID
 	private var pendingGridSize: Int = 100

app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListFragment.kt

@@ -20,7 +20,7 @@ import org.koitharu.kotatsu.utils.ext.ellipsize
 
 class LocalListFragment : MangaListFragment(), ActivityResultCallback<Uri> {
 
-	override val viewModel by viewModel<LocalListViewModel>()
+	override val viewModel by viewModel<LocalListViewModel>(mode = LazyThreadSafetyMode.NONE)
 	private val importCall = registerForActivityResult(
 		ActivityResultContracts.OpenDocument(),
 		this

app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt

@@ -42,7 +42,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 	NavigationView.OnNavigationItemSelectedListener,
 	View.OnClickListener {
 
-	private val viewModel by viewModel<MainViewModel>()
+	private val viewModel by viewModel<MainViewModel>(mode = LazyThreadSafetyMode.NONE)
 
 	private lateinit var drawerToggle: ActionBarDrawerToggle
 	private var closeable: Closeable? = null

app/src/main/java/org/koitharu/kotatsu/main/ui/protect/ProtectActivity.kt

@@ -19,7 +19,7 @@ import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 class ProtectActivity : BaseActivity<ActivityProtectBinding>(), TextView.OnEditorActionListener,
 	TextWatcher, View.OnClickListener {
 
-	private val viewModel by viewModel<ProtectViewModel>()
+	private val viewModel by viewModel<ProtectViewModel>(mode = LazyThreadSafetyMode.NONE)
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)

app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt

@@ -52,7 +52,7 @@ class ReaderActivity : BaseFullscreenActivity<ActivityReaderBinding>(),
 	GridTouchHelper.OnGridTouchListener, OnPageSelectListener, ReaderConfigDialog.Callback,
 	ActivityResultCallback<Boolean>, ReaderControlDelegate.OnInteractionListener {
 
-	private val viewModel by viewModel<ReaderViewModel> {
+	private val viewModel by viewModel<ReaderViewModel>(mode = LazyThreadSafetyMode.NONE) {
 		parametersOf(MangaIntent.from(intent), intent?.getParcelableExtra<ReaderState>(EXTRA_STATE))
 	}
 

app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt

@@ -15,7 +15,7 @@ import org.koitharu.kotatsu.utils.ext.withArgs
 
 class RemoteListFragment : MangaListFragment() {
 
-	override val viewModel by viewModel<RemoteListViewModel> {
+	override val viewModel by viewModel<RemoteListViewModel>(mode = LazyThreadSafetyMode.NONE) {
 		parametersOf(source)
 	}
 

app/src/main/java/org/koitharu/kotatsu/search/ui/SearchFragment.kt

@@ -10,7 +10,7 @@ import org.koitharu.kotatsu.utils.ext.withArgs
 
 class SearchFragment : MangaListFragment() {
 
-	override val viewModel by viewModel<SearchViewModel> {
+	override val viewModel by viewModel<SearchViewModel>(mode = LazyThreadSafetyMode.NONE) {
 		parametersOf(source, query)
 	}
 

app/src/main/java/org/koitharu/kotatsu/search/ui/global/GlobalSearchFragment.kt

@@ -9,7 +9,7 @@ import org.koitharu.kotatsu.utils.ext.withArgs
 
 class GlobalSearchFragment : MangaListFragment() {
 
-	override val viewModel by viewModel<GlobalSearchViewModel> {
+	override val viewModel by viewModel<GlobalSearchViewModel>(mode = LazyThreadSafetyMode.NONE) {
 		parametersOf(query)
 	}
 

app/src/main/java/org/koitharu/kotatsu/settings/HistorySettingsFragment.kt

@@ -23,7 +23,7 @@ import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 
 class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cache) {
 
-	private val trackerRepo by inject<TrackingRepository>()
+	private val trackerRepo by inject<TrackingRepository>(mode = LazyThreadSafetyMode.NONE)
 
 	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
 		addPreferencesFromResource(R.xml.pref_history)

app/src/main/java/org/koitharu/kotatsu/settings/backup/BackupDialogFragment.kt

@@ -17,7 +17,7 @@ import java.io.File
 
 class BackupDialogFragment : AlertDialogFragment<DialogProgressBinding>() {
 
-	private val viewModel by viewModel<BackupViewModel>()
+	private val viewModel by viewModel<BackupViewModel>(mode = LazyThreadSafetyMode.NONE)
 
 	override fun onInflateView(
 		inflater: LayoutInflater,

app/src/main/java/org/koitharu/kotatsu/settings/backup/RestoreDialogFragment.kt

@@ -25,7 +25,7 @@ class RestoreDialogFragment : AlertDialogFragment<DialogProgressBinding>() {
 		container: ViewGroup?
 	) = DialogProgressBinding.inflate(inflater, container, false)
 
-	private val viewModel by viewModel<RestoreViewModel> {
+	private val viewModel by viewModel<RestoreViewModel>(mode = LazyThreadSafetyMode.NONE) {
 		parametersOf(arguments?.getString(ARG_FILE)?.toUriOrNull())
 	}
 

app/src/main/java/org/koitharu/kotatsu/settings/protect/ProtectSetupActivity.kt

@@ -17,7 +17,7 @@ import org.koitharu.kotatsu.databinding.ActivitySetupProtectBinding
 class ProtectSetupActivity : BaseActivity<ActivitySetupProtectBinding>(), TextWatcher,
 	View.OnClickListener, TextView.OnEditorActionListener {
 
-	private val viewModel by viewModel<ProtectSetupViewModel>()
+	private val viewModel by viewModel<ProtectSetupViewModel>(mode = LazyThreadSafetyMode.NONE)
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)

app/src/main/java/org/koitharu/kotatsu/tracker/TrackerModule.kt

@@ -9,7 +9,7 @@ import org.koitharu.kotatsu.tracker.ui.FeedViewModel
 val trackerModule
 	get() = module {
 
-		single { TrackingRepository(get(), get()) }
+		single { TrackingRepository(get()) }
 
 		viewModel { FeedViewModel(androidContext(), get()) }
 	}

app/src/main/java/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt

@@ -5,12 +5,10 @@ import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.TrackEntity
 import org.koitharu.kotatsu.core.db.entity.TrackLogEntity
 import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import java.util.*
 
 class TrackingRepository(
 	private val db: MangaDatabase,
-	private val localMangaRepository: LocalMangaRepository
 ) {
 
 	suspend fun getNewChaptersCount(mangaId: Long): Int {

app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt

@@ -25,7 +25,7 @@ import org.koitharu.kotatsu.utils.progress.Progress
 class FeedFragment : BaseFragment<FragmentFeedBinding>(), PaginationScrollListener.Callback,
 	OnListItemClickListener<Manga> {
 
-	private val viewModel by viewModel<FeedViewModel>()
+	private val viewModel by viewModel<FeedViewModel>(mode = LazyThreadSafetyMode.NONE)
 
 	private var feedAdapter: FeedAdapter? = null
 	private var updateStatusSnackbar: Snackbar? = null

app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt

@@ -29,7 +29,7 @@ import org.koitharu.kotatsu.widget.shelf.model.CategoryItem
 
 class ShelfConfigActivity : BaseActivity<ActivityCategoriesBinding>(), OnListItemClickListener<CategoryItem> {
 
-	private val viewModel by viewModel<ShelfConfigViewModel>()
+	private val viewModel by viewModel<ShelfConfigViewModel>(mode = LazyThreadSafetyMode.NONE)
 
 	private lateinit var adapter: CategorySelectAdapter
 	private lateinit var config: AppWidgetConfig