From b6d8ede5e3b196f8f7bb73c984dcd579a54cd5b5 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 3 Jan 2024 22:22:51 +0800 Subject: [PATCH] Clean code --- app/build.gradle | 2 +- .../com/fongmi/android/tv/api/LiveParser.java | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c4049a17d..1f78bffce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 21 targetSdk 28 versionCode 215 - versionName "0103#3" + versionName "0103#4" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()] 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 8cc5281c2..357dfcd56 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 @@ -245,9 +245,8 @@ public class LiveParser { private void header(String line) { try { - if (header == null) header = new HashMap<>(); - if (line.contains("#EXTHTTP:")) header.putAll(Json.toMap(JsonParser.parseString(line.split("#EXTHTTP:")[1].trim()))); - if (line.contains("header=")) header.putAll(Json.toMap(JsonParser.parseString(line.split("header=")[1].trim()))); + if (line.contains("#EXTHTTP:")) header = Json.toMap(JsonParser.parseString(line.split("#EXTHTTP:")[1].trim())); + if (line.contains("header=")) header = Json.toMap(JsonParser.parseString(line.split("header=")[1].trim())); } catch (Exception e) { header = null; } @@ -256,15 +255,14 @@ public class LiveParser { private void headers(String line) { try { if (header == null) header = new HashMap<>(); - extract(line.split("headers=")[1].trim()); - } catch (Exception e) { - header = null; + headers(line.split("headers=")[1].trim().split("&")); + } catch (Exception ignored) { } } - private void extract(String line) { - for (String s : line.split("&")) { - String[] a = s.split("="); + private void headers(String[] params) { + for (String param : params) { + String[] a = param.split("="); header.put(a[0].trim(), a[1].trim()); } }