From 315af25979b7c5bca6d0595884d8fc3bcf131e48 Mon Sep 17 00:00:00 2001
From: okjack <okjackcaptain@gmail.com>
Date: Mon, 24 Jun 2024 21:44:32 +0800
Subject: [PATCH] Clean code

---
 app/src/main/java/com/fongmi/android/tv/api/Decoder.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/api/Decoder.java b/app/src/main/java/com/fongmi/android/tv/api/Decoder.java
index b11386ce6..ef5360773 100644
--- a/app/src/main/java/com/fongmi/android/tv/api/Decoder.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/Decoder.java
@@ -2,6 +2,7 @@ package com.fongmi.android.tv.api;
 
 import android.util.Base64;
 
+import androidx.media3.common.util.UriUtil;
 import com.fongmi.android.tv.utils.UrlUtil;
 import com.github.catvod.net.OkHttp;
 import com.github.catvod.utils.Asset;
@@ -34,8 +35,8 @@ public class Decoder {
 
     private static String fix(String url, String data) {
         if (url.startsWith("file") || url.startsWith("clan") || url.startsWith("assets")) url = UrlUtil.convert(url);
-        if (data.contains("../")) data = data.replace("../", url.substring(0, url.substring(0, url.split("\\?")[0].lastIndexOf("/")).lastIndexOf("/") + 1));
-        if (data.contains("./")) data = data.replace("./", url.substring(0, url.split("\\?")[0].lastIndexOf("/") + 1));
+        if (data.contains("../")) data = data.replace("../", UriUtil.resolve(url, "../"));
+        if (data.contains("./")) data = data.replace("./", UriUtil.resolve(url, "./"));
         return data;
     }