From 8df63bd3840a96b8db980bcda46c3e2fafe0e8bb Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Sun, 9 May 2021 18:46:22 -0400
Subject: [PATCH] More prevention fixes to make sure db doesn't add dup
 chapters when deeplinked

---
 .../tachiyomi/ui/reader/ReaderPresenter.kt    | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
index a0df22379c..1ce479e30d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
@@ -373,17 +373,24 @@ class ReaderPresenter(
             val id = db.insertManga(manga).executeOnIO().insertedId()
             manga.id = id ?: manga.id
             chapter.manga_id = manga.id
-            val chapterId = db.insertChapter(chapter).executeOnIO().insertedId() ?: return
-            if (chapters.isNotEmpty()) {
-                syncChaptersWithSource(
-                    db,
-                    chapters,
-                    manga,
-                    delegatedSource.delegate!!
-                )
-            }
-            withContext(Dispatchers.Main) {
-                init(manga, chapterId)
+            val matchingChapterId = db.getChapters(manga).executeOnIO().find { it.url == chapter.url }?.id
+            if (matchingChapterId != null) {
+                withContext(Dispatchers.Main) {
+                    this@ReaderPresenter.init(manga, matchingChapterId)
+                }
+            } else {
+                val chapterId = db.insertChapter(chapter).executeOnIO().insertedId() ?: return
+                if (chapters.isNotEmpty()) {
+                    syncChaptersWithSource(
+                        db,
+                        chapters,
+                        manga,
+                        delegatedSource.delegate!!
+                    )
+                }
+                withContext(Dispatchers.Main) {
+                    init(manga, chapterId)
+                }
             }
         } else error(preferences.context.getString(R.string.unknown_error))
     }