Răsfoiți Sursa

Fix getting stuck in chapter loop when chapters have identical URLs

arkon 4 ani în urmă
părinte
comite
b0106aa420

+ 0 - 1
app/src/main/java/eu/kanade/tachiyomi/data/database/models/CategoryImpl.kt

@@ -15,7 +15,6 @@ class CategoryImpl : Category {
         if (other == null || javaClass != other.javaClass) return false
 
         val category = other as Category
-
         return name == category.name
     }
 

+ 3 - 2
app/src/main/java/eu/kanade/tachiyomi/data/database/models/ChapterImpl.kt

@@ -31,10 +31,11 @@ class ChapterImpl : Chapter {
         if (other == null || javaClass != other.javaClass) return false
 
         val chapter = other as Chapter
-        return url == chapter.url
+        if (url != chapter.url) return false
+        return id == chapter.id
     }
 
     override fun hashCode(): Int {
-        return url.hashCode()
+        return url.hashCode() + id.hashCode()
     }
 }

+ 3 - 3
app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt

@@ -41,11 +41,11 @@ open class MangaImpl : Manga {
         if (other == null || javaClass != other.javaClass) return false
 
         val manga = other as Manga
-
-        return url == manga.url
+        if (url != manga.url) return false
+        return id == manga.id
     }
 
     override fun hashCode(): Int {
-        return url.hashCode()
+        return url.hashCode() + id.hashCode()
     }
 }