Use more core-ktx

app/src/main/java/exh/GalleryAdder.kt

@@ -2,6 +2,7 @@ package exh
 
 import android.content.Context
 import android.net.Uri
+import androidx.core.net.toUri
 import com.elvishew.xlog.XLog
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
@@ -23,7 +24,7 @@ class GalleryAdder {
     private val sourceManager: SourceManager by injectLazy()
 
     fun pickSource(url: String): List<UrlImportableSource> {
-        val uri = Uri.parse(url)
+        val uri = url.toUri()
         return sourceManager.getVisibleCatalogueSources()
             .map { it.getMainSource() }
             .filterIsInstance<UrlImportableSource>()
@@ -45,7 +46,7 @@ class GalleryAdder {
     ): GalleryAddEvent {
         XLog.d(context.getString(R.string.gallery_adder_importing_manga, url, fav.toString(), forceSource))
         try {
-            val uri = Uri.parse(url)
+            val uri = url.toUri()
 
             // Find matching source
             val source = if (forceSource != null) {

app/src/main/java/exh/debug/SettingsDebugController.kt

@@ -31,7 +31,7 @@ class SettingsDebugController : SettingsController() {
                 it.visibility == KVisibility.PUBLIC
             }.forEach {
                 preference {
-                    title = it.name.replace(Regex("(.)(\\p{Upper})"), "$1 $2").toLowerCase(Locale.getDefault()).capitalize(Locale.getDefault())
+                    title = it.name.replace("(.)(\\p{Upper})".toRegex(), "$1 $2").toLowerCase(Locale.getDefault()).capitalize(Locale.getDefault())
                     isPersistent = false
 
                     onClick {

app/src/main/java/exh/md/utils/MdUtil.kt

@@ -1,5 +1,6 @@
 package exh.md.utils
 
+import androidx.core.net.toUri
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.SourceManager
@@ -268,8 +269,8 @@ fun SManga.setMDUrlWithoutDomain(url: String) {
  */
 private fun getMDUrlWithoutDomain(orig: String): String {
     return try {
-        val uri = URI(orig)
-        var out = uri.path
+        val uri = orig.toUri()
+        var out = uri.path.orEmpty()
         if (uri.query != null) {
             out += "?" + uri.query
         }

app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt

@@ -2,6 +2,7 @@ package exh.metadata.metadata
 
 import android.content.Context
 import android.net.Uri
+import androidx.core.net.toUri
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.model.SManga
@@ -148,7 +149,7 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() {
             url.let {
                 // Only parse URL if is full URL
                 val pathSegments = if (it.startsWith("http")) {
-                    Uri.parse(it).pathSegments
+                    it.toUri().pathSegments
                 } else {
                     it.split('/')
                 }

app/src/main/java/exh/metadata/metadata/PervEdenSearchMetadata.kt

@@ -2,6 +2,7 @@ package exh.metadata.metadata
 
 import android.content.Context
 import android.net.Uri
+import androidx.core.net.toUri
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.model.SManga
 import exh.metadata.metadata.base.RaisedSearchMetadata
@@ -119,7 +120,7 @@ class PervEdenSearchMetadata : RaisedSearchMetadata() {
 
         private fun splitGalleryUrl(url: String) =
             url.let {
-                Uri.parse(it).pathSegments.filterNot(String::isNullOrBlank)
+                it.toUri().pathSegments.filterNot(String::isNullOrBlank)
             }
 
         fun pvIdFromUrl(url: String): String = splitGalleryUrl(url).last()

app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt

@@ -2,6 +2,7 @@ package exh.metadata.metadata
 
 import android.content.Context
 import android.net.Uri
+import androidx.core.net.toUri
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.model.SManga
 import exh.metadata.MetadataUtil
@@ -114,8 +115,7 @@ class TsuminoSearchMetadata : RaisedSearchMetadata() {
 
         val TSUMINO_DATE_FORMAT = SimpleDateFormat("yyyy-MM-dd", Locale.US)
 
-        fun tmIdFromUrl(url: String) =
-            Uri.parse(url).lastPathSegment
+        fun tmIdFromUrl(url: String) = url.toUri().lastPathSegment
 
         fun thumbUrlFromId(id: String) = "/thumbs/$id/1"
     }