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); }