From 85060d66d9d3e093b1c3c719e64895861776d5f9 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 3 Jan 2024 15:39:11 +0800 Subject: [PATCH] Clean code --- app/src/main/java/com/fongmi/android/tv/api/LiveParser.java | 4 ++-- app/src/main/java/com/fongmi/android/tv/bean/ClearKey.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java b/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java index fbdb3cdfc..282a9656c 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java +++ b/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java @@ -248,8 +248,8 @@ public class LiveParser { ClearKey.objectFrom(key); } catch (Exception e) { String[] split = key.replace("\"", "").replace("{", "").replace("}", "").split(":"); - String kid = Util.base64(Util.hex2byte(split[0])).replace("=", ""); - String k = Util.base64(Util.hex2byte(split[1])).replace("=", ""); + String kid = Util.base64(Util.hex2byte(split[0].trim())).replace("=", ""); + String k = Util.base64(Util.hex2byte(split[1].trim())).replace("=", ""); key = ClearKey.get(kid, k).toString(); } } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/ClearKey.java b/app/src/main/java/com/fongmi/android/tv/bean/ClearKey.java index af799fb27..0dfd6c6c6 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/ClearKey.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/ClearKey.java @@ -17,7 +17,7 @@ public class ClearKey { public static ClearKey objectFrom(String str) throws Exception { ClearKey item = App.gson().fromJson(str, ClearKey.class); - if (item == null || item.keys == null) throw new Exception(); + if (item.keys == null) throw new Exception(); return item; }