From 956d84d4591207860c4e0e18b9572e4e411efa68 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 10 Aug 2023 14:18:44 +0800
Subject: [PATCH] Clean code

---
 .../com/fongmi/android/tv/bean/Channel.java   | 10 ------
 .../java/com/fongmi/android/tv/bean/Drm.java  | 33 -------------------
 .../com/fongmi/android/tv/player/ExoUtil.java | 14 ++++----
 3 files changed, 6 insertions(+), 51 deletions(-)
 delete mode 100644 app/src/main/java/com/fongmi/android/tv/bean/Drm.java

diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Channel.java b/app/src/main/java/com/fongmi/android/tv/bean/Channel.java
index 55a69645f..500e4fe8e 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Channel.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Channel.java
@@ -37,8 +37,6 @@ public class Channel {
     private String referer;
     @SerializedName("header")
     private JsonElement header;
-    @SerializedName("drm")
-    private Drm drm;
 
     private boolean selected;
     private Group group;
@@ -133,14 +131,6 @@ public class Channel {
         this.header = header;
     }
 
-    public Drm getDrm() {
-        return drm;
-    }
-
-    public void setDrm(Drm drm) {
-        this.drm = drm;
-    }
-
     public Group getGroup() {
         return group;
     }
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
deleted file mode 100644
index aec17a08d..000000000
--- a/app/src/main/java/com/fongmi/android/tv/bean/Drm.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.fongmi.android.tv.bean;
-
-import androidx.media3.common.C;
-import androidx.media3.common.MediaItem;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.nio.charset.StandardCharsets;
-
-public class Drm {
-
-    @SerializedName("licenseType")
-    private String licenseType;
-    @SerializedName("licenseKey")
-    private String licenseKey;
-
-    public Drm(String licenseType, String licenseKey) {
-        this.licenseType = licenseType;
-        this.licenseKey = licenseKey;
-    }
-
-    public String getLicenseType() {
-        return licenseType;
-    }
-
-    public String getLicenseKey() {
-        return licenseKey;
-    }
-
-    public MediaItem.DrmConfiguration get() {
-        return new MediaItem.DrmConfiguration.Builder(C.CLEARKEY_UUID).setKeySetId(getLicenseKey().getBytes(StandardCharsets.UTF_8)).build();
-    }
-}
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 9b249dd76..b9e1b2ebb 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
@@ -37,7 +37,6 @@ import androidx.media3.ui.CaptionStyleCompat;
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.Setting;
 import com.fongmi.android.tv.bean.Channel;
-import com.fongmi.android.tv.bean.Drm;
 import com.fongmi.android.tv.bean.Result;
 import com.fongmi.android.tv.bean.Sub;
 import com.fongmi.android.tv.utils.Sniffer;
@@ -99,28 +98,27 @@ public class ExoUtil {
     }
 
     public static MediaSource getSource(Result result, int errorCode) {
-        return getSource(result.getHeaders(), result.getRealUrl(), result.getFormat(), result.getSubs(), null, errorCode);
+        return getSource(result.getHeaders(), result.getRealUrl(), result.getFormat(), result.getSubs(), errorCode);
     }
 
     public static MediaSource getSource(Channel channel, int errorCode) {
-        return getSource(channel.getHeaders(), channel.getUrl(), null, Collections.emptyList(), channel.getDrm(), errorCode);
+        return getSource(channel.getHeaders(), channel.getUrl(), null, Collections.emptyList(), errorCode);
     }
 
     public static MediaSource getSource(Map<String, String> headers, String url, int errorCode) {
-        return getSource(headers, url, null, Collections.emptyList(), null, errorCode);
+        return getSource(headers, url, null, Collections.emptyList(), errorCode);
     }
 
-    private static MediaSource getSource(Map<String, String> headers, String url, String format, List<Sub> subs, Drm drm, int errorCode) {
+    private static MediaSource getSource(Map<String, String> headers, String url, String format, List<Sub> subs, int errorCode) {
         Uri uri = Uri.parse(url.trim().replace("\\", ""));
         String mimeType = getMimeType(format, errorCode);
         if (uri.getUserInfo() != null) headers.put(HttpHeaders.AUTHORIZATION, "Basic " + Util.base64(uri.getUserInfo()));
-        return new DefaultMediaSourceFactory(getDataSourceFactory(headers), getExtractorsFactory()).createMediaSource(getMediaItem(uri, mimeType, subs, drm));
+        return new DefaultMediaSourceFactory(getDataSourceFactory(headers), getExtractorsFactory()).createMediaSource(getMediaItem(uri, mimeType, subs));
     }
 
-    private static MediaItem getMediaItem(Uri uri, String mimeType, List<Sub> subs, Drm drm) {
+    private static MediaItem getMediaItem(Uri uri, String mimeType, List<Sub> subs) {
         MediaItem.Builder builder = new MediaItem.Builder().setUri(uri);
         if (subs.size() > 0) builder.setSubtitleConfigurations(getSubtitles(subs));
-        if (drm != null) builder.setDrmConfiguration(drm.get());
         builder.setAllowChunklessPreparation(Players.isHard());
         if (mimeType != null) builder.setMimeType(mimeType);
         builder.setAds(Sniffer.getRegex(uri));