From 6d6b6a0a49d206764dbad1b3bd2fd31810da6000 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 2 Aug 2024 23:18:16 +0800 Subject: [PATCH] Update drm --- app/src/main/java/com/fongmi/android/tv/bean/Drm.java | 9 +-------- app/src/main/java/com/fongmi/android/tv/server/Nano.java | 2 -- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Drm.java b/app/src/main/java/com/fongmi/android/tv/bean/Drm.java index 4f5bf03cc..1b6484602 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Drm.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Drm.java @@ -5,8 +5,6 @@ import android.text.TextUtils; import androidx.media3.common.C; import androidx.media3.common.MediaItem; -import com.fongmi.android.tv.server.Server; -import com.github.catvod.utils.Util; import com.google.gson.annotations.SerializedName; import java.util.UUID; @@ -42,12 +40,7 @@ public class Drm { return C.UUID_NIL; } - private String getUri() { - if (getKey().startsWith("http")) return getKey(); - return Server.get().getAddress("/license/") + Util.base64(getKey(), Util.URL_SAFE); - } - public MediaItem.DrmConfiguration get() { - return new MediaItem.DrmConfiguration.Builder(getUUID()).setLicenseUri(getUri()).build(); + return new MediaItem.DrmConfiguration.Builder(getUUID()).setLicenseUri(getKey()).build(); } } diff --git a/app/src/main/java/com/fongmi/android/tv/server/Nano.java b/app/src/main/java/com/fongmi/android/tv/server/Nano.java index 0700b58b3..b583a25bf 100644 --- a/app/src/main/java/com/fongmi/android/tv/server/Nano.java +++ b/app/src/main/java/com/fongmi/android/tv/server/Nano.java @@ -9,7 +9,6 @@ import com.fongmi.android.tv.server.process.Media; import com.fongmi.android.tv.server.process.Process; import com.fongmi.android.tv.server.process.Proxy; import com.github.catvod.utils.Asset; -import com.github.catvod.utils.Util; import org.nanohttpd.protocols.http.IHTTPSession; import org.nanohttpd.protocols.http.NanoHTTPD; @@ -67,7 +66,6 @@ public class Nano extends NanoHTTPD { if (url.contains("?")) url = url.substring(0, url.indexOf('?')); if (url.startsWith("/tvbus")) return ok(LiveConfig.getResp()); if (url.startsWith("/device")) return ok(Device.get().toString()); - if (url.startsWith("/license")) return ok(new String(Util.decode(url.substring(9), Util.URL_SAFE))); for (Process process : process) if (process.isRequest(session, url)) return process.doResponse(session, url, files); return getAssets(url.substring(1)); }