From f3a03ce9b6fd2e428ea8722e95a07e117927eff8 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 16 Jan 2024 00:56:34 +0800
Subject: [PATCH] Clean code

---
 .../main/java/com/fongmi/android/tv/player/ExoUtil.java  | 2 +-
 catvod/src/main/java/com/github/catvod/net/OkHttp.java   | 9 ---------
 .../catvod/net/interceptor/DefaultInterceptor.java       | 3 +++
 catvod/src/main/java/com/github/catvod/utils/Util.java   | 5 ++---
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java b/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java
index efed90cbe..c2ae32a12 100644
--- a/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java
@@ -137,7 +137,7 @@ public class ExoUtil {
         Uri uri = UrlUtil.uri(url);
         if (sub != null) subs.add(sub);
         String mimeType = getMimeType(format, errorCode);
-        if (uri.getUserInfo() != null) headers.put(HttpHeaders.AUTHORIZATION, Util.basic(uri));
+        if (uri.getUserInfo() != null) headers.put(HttpHeaders.AUTHORIZATION, Util.basic(uri.getUserInfo()));
         return new DefaultMediaSourceFactory(getDataSourceFactory(headers), getExtractorsFactory()).createMediaSource(getMediaItem(uri, mimeType, subs, drm));
     }
 
diff --git a/catvod/src/main/java/com/github/catvod/net/OkHttp.java b/catvod/src/main/java/com/github/catvod/net/OkHttp.java
index de7bd47f4..1e5261d32 100644
--- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java
+++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java
@@ -1,6 +1,5 @@
 package com.github.catvod.net;
 
-import android.net.Uri;
 import android.text.TextUtils;
 
 import androidx.collection.ArrayMap;
@@ -8,8 +7,6 @@ import androidx.collection.ArrayMap;
 import com.github.catvod.bean.Doh;
 import com.github.catvod.net.interceptor.DefaultInterceptor;
 import com.github.catvod.utils.Path;
-import com.github.catvod.utils.Util;
-import com.google.common.net.HttpHeaders;
 
 import java.net.ProxySelector;
 import java.util.Map;
@@ -99,8 +96,6 @@ public class OkHttp {
     }
 
     public static Call newCall(String url) {
-        Uri uri = Uri.parse(url);
-        if (uri.getUserInfo() != null) return newCall(url, Headers.of(HttpHeaders.AUTHORIZATION, Util.basic(uri)));
         return client().newCall(new Request.Builder().url(url).build());
     }
 
@@ -108,10 +103,6 @@ public class OkHttp {
         return client.newCall(new Request.Builder().url(url).build());
     }
 
-    public static Call newCall(OkHttpClient client, String url, Headers headers) {
-        return client.newCall(new Request.Builder().url(url).headers(headers).build());
-    }
-
     public static Call newCall(String url, Headers headers) {
         return client().newCall(new Request.Builder().url(url).headers(headers).build());
     }
diff --git a/catvod/src/main/java/com/github/catvod/net/interceptor/DefaultInterceptor.java b/catvod/src/main/java/com/github/catvod/net/interceptor/DefaultInterceptor.java
index f7765322d..51ffb528f 100644
--- a/catvod/src/main/java/com/github/catvod/net/interceptor/DefaultInterceptor.java
+++ b/catvod/src/main/java/com/github/catvod/net/interceptor/DefaultInterceptor.java
@@ -8,6 +8,7 @@ import com.github.catvod.utils.Util;
 import com.google.common.net.HttpHeaders;
 
 import java.io.IOException;
+import java.net.URI;
 import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
 
@@ -49,11 +50,13 @@ public class DefaultInterceptor implements Interceptor {
     }
 
     private Request getRequest(@NonNull Request request) {
+        URI uri = request.url().uri();
         String url = request.url().toString();
         Request.Builder builder = request.newBuilder();
         boolean local = url.contains(":" + Proxy.getPort() + "/");
         if (url.contains("+") && local) builder.url(url.replace("+", "%2B"));
         if (url.contains("gitcode.net")) builder.addHeader(HttpHeaders.USER_AGENT, Util.CHROME);
+        if (uri.getUserInfo() != null) builder.addHeader(HttpHeaders.AUTHORIZATION, Util.basic(uri.getUserInfo()));
         return builder.build();
     }
 }
diff --git a/catvod/src/main/java/com/github/catvod/utils/Util.java b/catvod/src/main/java/com/github/catvod/utils/Util.java
index 46f6d5591..a3ddd6428 100644
--- a/catvod/src/main/java/com/github/catvod/utils/Util.java
+++ b/catvod/src/main/java/com/github/catvod/utils/Util.java
@@ -1,7 +1,6 @@
 package com.github.catvod.utils;
 
 import android.content.Context;
-import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.text.TextUtils;
 import android.text.format.Formatter;
@@ -32,8 +31,8 @@ public class Util {
         return Base64.encodeToString(bytes, Base64.DEFAULT | Base64.NO_WRAP);
     }
 
-    public static String basic(Uri uri) {
-        return "Basic " + base64(uri.getUserInfo());
+    public static String basic(String userInfo) {
+        return "Basic " + base64(userInfo);
     }
 
     public static byte[] hex2byte(String s) {