From 9130f182fd5c81e26370112fc43f2b063b6dce9b Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 8 Jun 2023 11:37:31 +0800
Subject: [PATCH] Use UriUtil to fix url

---
 app/src/main/java/com/fongmi/android/tv/utils/Utils.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Utils.java b/app/src/main/java/com/fongmi/android/tv/utils/Utils.java
index a44c8356a..0ada0f9db 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/Utils.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/Utils.java
@@ -5,7 +5,6 @@ import android.app.Activity;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Build;
 import android.os.IBinder;
 import android.provider.Settings;
@@ -17,6 +16,7 @@ import android.view.Window;
 import android.view.inputmethod.InputMethodManager;
 
 import androidx.fragment.app.FragmentActivity;
+import androidx.media3.common.util.UriUtil;
 
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.server.Server;
@@ -109,12 +109,7 @@ public class Utils {
     public static String convert(String baseUrl, String text) {
         if (TextUtils.isEmpty(text)) return "";
         if (text.startsWith("clan")) return checkClan(text);
-        if (text.startsWith(".")) text = text.substring(1);
-        if (text.startsWith("/")) text = text.substring(1);
-        String last = Uri.parse(baseUrl).getLastPathSegment();
-        if (last == null) return Uri.parse(baseUrl).getScheme() + "://" + text;
-        int index = baseUrl.lastIndexOf(last);
-        return baseUrl.substring(0, index) + text;
+        return UriUtil.resolve(baseUrl, text);
     }
 
     public static String getMd5(String src) {