From be867d5d07e39f10fb3ac1684e745a9467ffbdc7 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sat, 24 Jun 2023 15:49:00 +0800
Subject: [PATCH] Cleanup HttpUrl usage

---
 .../java/com/hippo/ehviewer/client/EhUrl.kt   | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt b/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt
index cade3ce38..777bcc1f1 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt
@@ -16,9 +16,7 @@
 package com.hippo.ehviewer.client
 
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.network.UrlBuilder
 import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrl
 
 object EhUrl {
     const val SITE_E = 0
@@ -135,22 +133,17 @@ object EhUrl {
         return getGalleryDetailUrl(gid, token, 0, false)
     }
 
-    fun getGalleryDetailUrl(gid: Long, token: String?, index: Int, allComment: Boolean) = HttpUrl.Builder().apply {
+    fun getGalleryDetailUrl(gid: Long, token: String?, index: Int, allComment: Boolean) = httpsUrl {
         host(domain)
-        scheme("https")
         addPathSegments("g/$gid/$token/")
-        if (index != 0) {
-            addEncodedQueryParameter("p", index.toString())
-        }
-        if (allComment) {
-            addEncodedQueryParameter("hc", 1.toString())
-        }
+        if (index != 0) addEncodedQueryParameter("p", index.toString())
+        if (allComment) addEncodedQueryParameter("hc", 1.toString())
     }.toString()
 
-    fun getGalleryMultiPageViewerUrl(gid: Long, token: String): String {
-        val builder = UrlBuilder((host + "mpv/" + gid + '/' + token + '/').toHttpUrl().newBuilder())
-        return builder.url.toString()
-    }
+    fun getGalleryMultiPageViewerUrl(gid: Long, token: String) = httpsUrl {
+        host(domain)
+        addPathSegments("mpv/$gid/$token/")
+    }.toString()
 
     fun getPageUrl(gid: Long, index: Int, pToken: String): String {
         return host + "s/" + pToken + '/' + gid + '-' + (index + 1)
@@ -168,3 +161,5 @@ object EhUrl {
         return "https://ehwiki.org/wiki/" + tag.replace(' ', '_')
     }
 }
+
+inline fun httpsUrl(builder: HttpUrl.Builder.() -> Unit) = HttpUrl.Builder().apply(builder).host("https").build()