From e4bbfca298f908c74841c867631e6a0a61cdc7a2 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 1 Sep 2022 00:13:51 +0800 Subject: [PATCH] Clean code --- app/src/main/java/com/fongmi/android/tv/bean/Result.java | 5 +++-- app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Result.java b/app/src/main/java/com/fongmi/android/tv/bean/Result.java index da8db2f69..fe6ae608a 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Result.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Result.java @@ -63,7 +63,8 @@ public class Result { public static Result fromJson(String str) { try { - Type type = new TypeToken>>() {}.getType(); + Type type = new TypeToken>>() { + }.getType(); Gson gson = new GsonBuilder().registerTypeAdapter(type, new FiltersAdapter()).create(); Result result = gson.fromJson(str, Result.class); return result == null ? empty() : result; @@ -161,7 +162,7 @@ public class Result { } public String getSub() { - return sub; + return TextUtils.isEmpty(sub) ? "" : sub; } public Map getHeaders() { 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 647e90400..17a15c4b3 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 @@ -1,7 +1,6 @@ package com.fongmi.android.tv.player; import android.net.Uri; -import android.text.TextUtils; import com.fongmi.android.tv.App; import com.fongmi.android.tv.bean.Result; @@ -39,8 +38,7 @@ public class ExoUtil { } private static MediaItem.SubtitleConfiguration getConfig(Result result) { - if (TextUtils.isEmpty(result.getSub())) return null; - return new MediaItem.SubtitleConfiguration.Builder(Uri.parse(result.getSub())).setMimeType(MimeTypes.APPLICATION_SUBRIP).setSelectionFlags(C.SELECTION_FLAG_DEFAULT).build(); + return result.getSub().isEmpty() ? null : new MediaItem.SubtitleConfiguration.Builder(Uri.parse(result.getSub())).setMimeType(MimeTypes.APPLICATION_SUBRIP).setSelectionFlags(C.SELECTION_FLAG_DEFAULT).build(); } private static DataSource.Factory getFactory(Map headers, String url) {