diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..7353614049 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +* text=auto +* text eol=lf diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt index 4f92d73388..cb41050c9a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt @@ -74,4 +74,4 @@ open class SourceManager(private val context: Context) { } } -class SourceNotFoundException(message: String, val id: Long) : Exception(message) \ No newline at end of file +class SourceNotFoundException(message: String, val id: Long) : Exception(message) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt b/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt index 8af15e171f..3e3ef8206b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt @@ -23,7 +23,6 @@ interface SManga : Serializable { var initialized: Boolean fun copyFrom(other: SManga) { - if (other.author != null) author = other.author diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt index 1838580ab5..825f4504fc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt @@ -496,8 +496,12 @@ class ChaptersController() : NucleusController(), presenter.deleteChapters(chapters) } - fun onChaptersDeleted() { + fun onChaptersDeleted(chapters: List) { dismissDeletingDialog() + //this is needed so the downloaded text gets removed from the item + chapters.forEach { + adapter?.updateItem(it) + } adapter?.notifyDataSetChanged() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt index 029ea4ee17..0a4424629c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt @@ -223,7 +223,7 @@ class ChaptersPresenter( */ fun getNextUnreadChapter(): ChapterItem? { return chapters.sortedByDescending { it.source_order }.find { !it.read } -} + } /** * Mark the selected chapter list as read/unread. @@ -278,7 +278,7 @@ class ChaptersPresenter( .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribeFirst({ view, _ -> - view.onChaptersDeleted() + view.onChaptersDeleted(chapters) }, ChaptersController::onChaptersDeletedError) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackAdapter.kt index 8a3830cac6..5a57a1b72e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackAdapter.kt @@ -5,7 +5,7 @@ import android.view.ViewGroup import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.inflate -class TrackAdapter(controller: TrackController) : androidx.recyclerview.widget.RecyclerView.Adapter() { +class TrackAdapter(controller: TrackController) : RecyclerView.Adapter() { var items = emptyList() set(value) {