More core-ktx usages

app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt

@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.data.track.anilist
 
 import android.net.Uri
+import androidx.core.net.toUri
 import com.github.salomonbrys.kotson.array
 import com.github.salomonbrys.kotson.get
 import com.github.salomonbrys.kotson.jsonObject
@@ -291,7 +292,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
             return baseMangaUrl + mediaId
         }
 
-        fun authUrl() = Uri.parse("${baseUrl}oauth/authorize").buildUpon()
+        fun authUrl(): Uri = "${baseUrl}oauth/authorize".toUri().buildUpon()
             .appendQueryParameter("client_id", clientId)
             .appendQueryParameter("response_type", "token")
             .build()

app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiApi.kt

@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.data.track.bangumi
 
 import android.net.Uri
+import androidx.core.net.toUri
 import com.github.salomonbrys.kotson.array
 import com.github.salomonbrys.kotson.obj
 import com.google.gson.Gson
@@ -72,9 +73,9 @@ class BangumiApi(private val client: OkHttpClient, interceptor: BangumiIntercept
     }
 
     fun search(search: String): Observable<List<TrackSearch>> {
-        val url = Uri.parse(
-            "$apiUrl/search/subject/${URLEncoder.encode(search, Charsets.UTF_8.name())}"
-        ).buildUpon()
+        val url = "$apiUrl/search/subject/${URLEncoder.encode(search, Charsets.UTF_8.name())}"
+            .toUri()
+            .buildUpon()
             .appendQueryParameter("max_results", "20")
             .build()
         val request = Request.Builder()
@@ -196,8 +197,8 @@ class BangumiApi(private val client: OkHttpClient, interceptor: BangumiIntercept
             return "$baseMangaUrl/$remoteId"
         }
 
-        fun authUrl() =
-            Uri.parse(loginUrl).buildUpon()
+        fun authUrl(): Uri =
+            loginUrl.toUri().buildUpon()
                 .appendQueryParameter("client_id", clientId)
                 .appendQueryParameter("response_type", "code")
                 .appendQueryParameter("redirect_uri", redirectUrl)

app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.track.myanimelist
 
-import android.net.Uri
+import androidx.core.net.toUri
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.model.TrackSearch
@@ -260,13 +260,13 @@ class MyAnimeListApi(private val client: OkHttpClient, interceptor: MyAnimeListI
 
         private fun mangaUrl(remoteId: Int) = baseMangaUrl + remoteId
 
-        private fun loginUrl() = Uri.parse(baseUrl).buildUpon()
+        private fun loginUrl() = baseUrl.toUri().buildUpon()
             .appendPath("login.php")
             .toString()
 
         private fun searchUrl(query: String): String {
             val col = "c[]"
-            return Uri.parse(baseUrl).buildUpon()
+            return baseUrl.toUri().buildUpon()
                 .appendPath("manga.php")
                 .appendQueryParameter("q", query)
                 .appendQueryParameter(col, "a")
@@ -278,17 +278,17 @@ class MyAnimeListApi(private val client: OkHttpClient, interceptor: MyAnimeListI
                 .toString()
         }
 
-        private fun exportListUrl() = Uri.parse(baseUrl).buildUpon()
+        private fun exportListUrl() = baseUrl.toUri().buildUpon()
             .appendPath("panel.php")
             .appendQueryParameter("go", "export")
             .toString()
 
-        private fun editPageUrl(mediaId: Int) = Uri.parse(baseModifyListUrl).buildUpon()
+        private fun editPageUrl(mediaId: Int) = baseModifyListUrl.toUri().buildUpon()
             .appendPath(mediaId.toString())
             .appendPath("edit")
             .toString()
 
-        private fun addUrl() = Uri.parse(baseModifyListUrl).buildUpon()
+        private fun addUrl() = baseModifyListUrl.toUri().buildUpon()
             .appendPath("add.json")
             .toString()
 

app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/ShikimoriApi.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.track.shikimori
 
-import android.net.Uri
+import androidx.core.net.toUri
 import com.github.salomonbrys.kotson.array
 import com.github.salomonbrys.kotson.jsonObject
 import com.github.salomonbrys.kotson.nullString
@@ -54,7 +54,7 @@ class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInter
     fun updateLibManga(track: Track, user_id: String): Observable<Track> = addLibManga(track, user_id)
 
     fun search(search: String): Observable<List<TrackSearch>> {
-        val url = Uri.parse("$apiUrl/mangas").buildUpon()
+        val url = "$apiUrl/mangas".toUri().buildUpon()
             .appendQueryParameter("order", "popularity")
             .appendQueryParameter("search", search)
             .appendQueryParameter("limit", "20")
@@ -102,7 +102,7 @@ class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInter
     }
 
     fun findLibManga(track: Track, user_id: String): Observable<Track?> {
-        val url = Uri.parse("$apiUrl/v2/user_rates").buildUpon()
+        val url = "$apiUrl/v2/user_rates".toUri().buildUpon()
             .appendQueryParameter("user_id", user_id)
             .appendQueryParameter("target_id", track.media_id.toString())
             .appendQueryParameter("target_type", "Manga")
@@ -112,7 +112,7 @@ class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInter
             .get()
             .build()
 
-        val urlMangas = Uri.parse("$apiUrl/mangas").buildUpon()
+        val urlMangas = "$apiUrl/mangas".toUri().buildUpon()
             .appendPath(track.media_id.toString())
             .build()
         val requestMangas = Request.Builder()
@@ -187,7 +187,7 @@ class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInter
         }
 
         fun authUrl() =
-            Uri.parse(loginUrl).buildUpon()
+            loginUrl.toUri().buildUpon()
                 .appendQueryParameter("client_id", clientId)
                 .appendQueryParameter("redirect_uri", redirectUrl)
                 .appendQueryParameter("response_type", "code")