From 995a1155e449c013367ef5c9a0f267e97daf2e98 Mon Sep 17 00:00:00 2001
From: NerdNumber9 <nerd.number9@yandex.com>
Date: Sun, 15 Apr 2018 14:35:00 -0400
Subject: [PATCH] Update changelogs and add hitomi.la URL importing

---
 app/src/main/AndroidManifest.xml              | 16 +++++++++++
 .../tachiyomi/source/online/all/Hitomi.kt     | 28 +++++++++++--------
 app/src/main/java/exh/GalleryAdder.kt         |  8 ++++++
 app/src/main/res/raw/changelog_release.xml    |  9 ++++++
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c7cda4e0..0f0eed2d5 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -182,6 +182,22 @@
                     android:host="www.tsumino.com"
                     android:pathPrefix="/Read/View/"
                     android:scheme="https"/>
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/galleries/"
+                    android:scheme="http"/>
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/reader/"
+                    android:scheme="http"/>
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/galleries/"
+                    android:scheme="https"/>
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/reader/"
+                    android:scheme="https"/>
             </intent-filter>
         </activity>
         <activity
diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt
index e272d4129..a92ad48ff 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt
@@ -190,27 +190,33 @@ class Hitomi(private val context: Context)
     }
 
     override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable<MangasPage> {
-        return trySearch(page, query).map {
-            val res = it.map {
-                SManga.create().apply {
-                    setUrlWithoutDomain(it.url!!)
+        return urlImportFetchSearchManga(query, {
+            trySearch(page, query).map {
+                val res = it.map {
+                    SManga.create().apply {
+                        setUrlWithoutDomain(it.url!!)
 
-                    title = it.title!!
+                        title = it.title!!
 
-                    it.thumbnailUrl?.let {
-                        thumbnail_url = it
+                        it.thumbnailUrl?.let {
+                            thumbnail_url = it
+                        }
                     }
                 }
-            }
 
-            MangasPage(res, it.isNotEmpty())
-        }
+                MangasPage(res, it.isNotEmpty())
+            }
+        })
     }
 
     override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
         return lazyLoadMetaPages(HitomiGalleryMetadata.hlIdFromUrl(manga.url), true)
                 .map {
-                    manga.copyFrom(parseToManga(queryFromUrl(manga.url), it.first))
+                    val newManga = parseToManga(queryFromUrl(manga.url), it.first)
+                    manga.copyFrom(newManga)
+                    // Forcibly copy title as copyFrom does not
+                    manga.title = newManga.title
+
                     manga
                 }
                 .subscribeOn(parseToMangaScheduler())
diff --git a/app/src/main/java/exh/GalleryAdder.kt b/app/src/main/java/exh/GalleryAdder.kt
index c082f35e7..b3ba0a7de 100755
--- a/app/src/main/java/exh/GalleryAdder.kt
+++ b/app/src/main/java/exh/GalleryAdder.kt
@@ -78,6 +78,7 @@ class GalleryAdder {
                 }
                 "hentai.cafe" -> HENTAI_CAFE_SOURCE_ID
                 "www.tsumino.com" -> TSUMINO_SOURCE_ID
+                "hitomi.la" -> HITOMI_SOURCE_ID
                 else -> return GalleryAddEvent.Fail.UnknownType(url)
             }
 
@@ -123,6 +124,12 @@ class GalleryAdder {
                         
                     "https://tsumino.com/Book/Info/${urlObj.pathSegments[2]}"
                 }
+                HITOMI_SOURCE_ID -> {
+                    if(lcFirstPathSegment != "galleries" && lcFirstPathSegment != "reader")
+                        return GalleryAddEvent.Fail.UnknownType(url)
+
+                    "https://hitomi.la/galleries/${urlObj.pathSegments[1].substringBefore('.')}.html"
+                }
                 else -> return GalleryAddEvent.Fail.UnknownType(url)
             }
 
@@ -136,6 +143,7 @@ class GalleryAdder {
                 PERV_EDEN_IT_SOURCE_ID -> getUrlWithoutDomain(realUrl)
                 HENTAI_CAFE_SOURCE_ID -> getUrlWithoutDomain(realUrl)
                 TSUMINO_SOURCE_ID -> getUrlWithoutDomain(realUrl)
+                HITOMI_SOURCE_ID -> getUrlWithoutDomain(realUrl)
                 else -> return GalleryAddEvent.Fail.UnknownType(url)
             }
 
diff --git a/app/src/main/res/raw/changelog_release.xml b/app/src/main/res/raw/changelog_release.xml
index 75ddfc123..40ee38049 100755
--- a/app/src/main/res/raw/changelog_release.xml
+++ b/app/src/main/res/raw/changelog_release.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog bulletedList="true">
+    <changelogversion versionName="v7.2.0-EH" changeDate="">
+        <changelogtext>Fix Tsumino search page offset</changelogtext>
+        <changelogtext>Added hitomi.la source (searching is still very slow/buggy)</changelogtext>
+        <changelogtext>Add option to expand search filter by default</changelogtext>
+        <changelogtext>Add an option to disable auto lock and add manual locking</changelogtext>
+        <changelogtext>Re-theme lock view (again)</changelogtext>
+        <changelogtext>Fix broken back button in search</changelogtext>
+        <changelogtext>Fix Tsumino captcha appearing multiple times</changelogtext>
+    </changelogversion>
     <changelogversion versionName="v7.0.0-EH" changeDate="">
         <changelogtext>More fixes to favorites sync</changelogtext>
         <changelogtext>Added options to ignore errors in favorites sync</changelogtext>