From 37866e74793491d56e806c4a34c9760675819e36 Mon Sep 17 00:00:00 2001 From: sifacaii Date: Wed, 31 Aug 2022 21:12:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0jellyfin=20client?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/org/sifacai/vlcjellyfin/JfClient.java | 6 +++--- .../main/java/org/sifacai/vlcjellyfin/SearchActivity.java | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/JfClient.java b/app/src/main/java/org/sifacai/vlcjellyfin/JfClient.java index 1913211..7f1bc72 100644 --- a/app/src/main/java/org/sifacai/vlcjellyfin/JfClient.java +++ b/app/src/main/java/org/sifacai/vlcjellyfin/JfClient.java @@ -133,17 +133,17 @@ public class JfClient { String jsonstr = SendGet(movieUrl); JsonObject moviejob = strToGson(jsonstr, JsonObject.class); JsonElement je = jeFromGson(moviejob, "Items"); - if (je != null) items.add(je.getAsJsonArray()); + if (moviejob != null) items.addAll(je.getAsJsonArray()); jsonstr = SendGet(seriesUrl); JsonObject seriesobj = strToGson(jsonstr, JsonObject.class); je = jeFromGson(seriesobj, "Items"); - if (je != null) items.add(je.getAsJsonArray()); + if (seriesobj != null) items.addAll(je.getAsJsonArray()); jsonstr = SendGet(personUrl); JsonObject personobj = strToGson(jsonstr,JsonObject.class); je = jeFromGson(personobj,"Items"); - if (je != null) items.add(je.getAsJsonArray()); + if (personobj != null) items.addAll(je.getAsJsonArray()); scb.onSuccess(items); } diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/SearchActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/SearchActivity.java index 732e43b..85a57cb 100644 --- a/app/src/main/java/org/sifacai/vlcjellyfin/SearchActivity.java +++ b/app/src/main/java/org/sifacai/vlcjellyfin/SearchActivity.java @@ -76,6 +76,7 @@ public class SearchActivity extends BaseActivity implements JAdapter.OnItemClick @Override public void onSuccess(JsonArray items) { adapter.addItems(items); + dismissLoadingDialog(); } },null); }