From 8b32a60743b94a1be3f27f9c2b6b1dd0e89dc528 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 16 May 2020 09:16:25 +0300
Subject: [PATCH] Misc fixes

---
 .../kotatsu/domain/favourites/FavouritesRepository.kt       | 2 +-
 .../koitharu/kotatsu/domain/history/HistoryRepository.kt    | 2 +-
 .../ui/main/list/favourites/FavouritesListPresenter.kt      | 6 +++++-
 .../kotatsu/ui/settings/sources/SourcesSettingsFragment.kt  | 3 +++
 .../java/org/koitharu/kotatsu/ui/tracker/TrackWorker.kt     | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/domain/favourites/FavouritesRepository.kt b/app/src/main/java/org/koitharu/kotatsu/domain/favourites/FavouritesRepository.kt
index 78f95b5d2..fcbba0119 100644
--- a/app/src/main/java/org/koitharu/kotatsu/domain/favourites/FavouritesRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/domain/favourites/FavouritesRepository.kt
@@ -105,7 +105,7 @@ class FavouritesRepository : KoinComponent {
 		}
 
 		fun unsubscribe(listener: OnFavouritesChangeListener) {
-			listeners += listener
+			listeners -= listener
 		}
 
 		private suspend fun notifyFavouritesChanged(mangaId: Long) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/domain/history/HistoryRepository.kt b/app/src/main/java/org/koitharu/kotatsu/domain/history/HistoryRepository.kt
index 16f8d5992..5c5e388de 100644
--- a/app/src/main/java/org/koitharu/kotatsu/domain/history/HistoryRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/domain/history/HistoryRepository.kt
@@ -86,7 +86,7 @@ class HistoryRepository : KoinComponent {
 		}
 
 		fun unsubscribe(listener: OnHistoryChangeListener) {
-			listeners += listener
+			listeners -= listener
 		}
 
 		private suspend fun notifyHistoryChanged() {
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesListPresenter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesListPresenter.kt
index 75e2b45bd..037b03eb0 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesListPresenter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesListPresenter.kt
@@ -26,7 +26,11 @@ class FavouritesListPresenter : BasePresenter<MangaListView<Unit>>() {
 			viewState.onLoadingStateChanged(true)
 			try {
 				val list = withContext(Dispatchers.IO) {
-					repository.getManga(categoryId = categoryId, offset = offset)
+					if (categoryId == 0L) {
+						repository.getAllManga(offset = offset)
+					} else {
+						repository.getManga(categoryId = categoryId, offset = offset)
+					}
 				}
 				if (offset == 0) {
 					viewState.onListChanged(list)
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/settings/sources/SourcesSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/settings/sources/SourcesSettingsFragment.kt
index 264c821b1..c97276681 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/settings/sources/SourcesSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/settings/sources/SourcesSettingsFragment.kt
@@ -2,7 +2,9 @@ package org.koitharu.kotatsu.ui.settings.sources
 
 import android.os.Bundle
 import android.view.View
+import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.fragment_settings_sources.*
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.MangaSource
@@ -27,6 +29,7 @@ class SourcesSettingsFragment : BaseFragment(R.layout.fragment_settings_sources)
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
+		recyclerView.addItemDecoration(DividerItemDecoration(view.context, RecyclerView.VERTICAL))
 		recyclerView.adapter = SourcesAdapter(this)
 		reorderHelper.attachToRecyclerView(recyclerView)
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/tracker/TrackWorker.kt b/app/src/main/java/org/koitharu/kotatsu/ui/tracker/TrackWorker.kt
index f0c3e26c9..2bcf70ccf 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/tracker/TrackWorker.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/tracker/TrackWorker.kt
@@ -134,7 +134,7 @@ class TrackWorker(context: Context, workerParams: WorkerParameters) :
 			newChapters.size, newChapters.size)
 		with(builder) {
 			setContentText(summary)
-			setContentText(manga.title)
+			setContentTitle(manga.title)
 			setNumber(newChapters.size)
 			setLargeIcon(Coil.execute(GetRequestBuilder(applicationContext)
 				.data(manga.coverUrl)