From 3f4e98615573fa8ede1dd3aa8f6fc39f35bb0793 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 7 Sep 2022 10:46:29 +0800
Subject: [PATCH] Add null check

---
 .../fongmi/android/tv/ui/activity/DetailActivity.java    | 2 +-
 .../main/java/com/fongmi/android/tv/api/ApiConfig.java   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
index 166f86716..d8f8c66d4 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
@@ -427,7 +427,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDown.Listen
             @Override
             public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
                 List<String> items = Part.get(response.body().string());
-                if (!items.contains(source)) items.add(source);
+                if (!items.contains(source)) items.add(0, source);
                 mHandler.post(() -> mPartAdapter.setItems(items, null));
             }
         });
diff --git a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
index 0e6a89019..f48ae16ae 100644
--- a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
@@ -24,6 +24,7 @@ import org.json.JSONObject;
 
 import java.io.FileReader;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -195,19 +196,19 @@ public class ApiConfig {
     }
 
     public List<Site> getSites() {
-        return sites;
+        return sites == null ? Collections.emptyList() : sites;
     }
 
     public List<Parse> getParses() {
-        return parses;
+        return parses == null ? Collections.emptyList() : parses;
     }
 
     public String getAds() {
-        return ads.toString();
+        return ads == null ? "" : ads.toString();
     }
 
     public List<String> getFlags() {
-        return flags;
+        return flags == null ? Collections.emptyList() : flags;
     }
 
     public Site getHome() {