From c4519c591464c6c7a5cb4faaab5f462ec5a8b8bd Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Mon, 29 Oct 2018 20:30:06 +0800
Subject: [PATCH] Fix missing gallery uploader

---
 .../com/hippo/ehviewer/client/EhEngine.java   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.java b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.java
index 7631803bd..7030e1d8a 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.java
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.java
@@ -211,7 +211,7 @@ public class EhEngine {
             }
         }
 
-        if (list.size() > 0 && (Settings.getShowJpnTitle() || Settings.getShowGalleryPages() || sEhFilter.needCallApi())) {
+        if (list.size() > 0 && (TextUtils.isEmpty(list.get(0).uploader) || Settings.getShowJpnTitle() || Settings.getShowGalleryPages() || sEhFilter.needCallApi())) {
             // Fill by api
             fillGalleryListByApi(task, okHttpClient, list);
 
@@ -479,11 +479,13 @@ public class EhEngine {
             throw e;
         }
 
-        if (callApi && result.galleryInfoList.size() > 0) {
-            fillGalleryListByApi(task, okHttpClient, result.galleryInfoList);
+        List<GalleryInfo> list = result.galleryInfoList;
+
+        if (list.size() > 0 && (TextUtils.isEmpty(list.get(0).uploader) || Settings.getShowJpnTitle() || Settings.getShowGalleryPages())) {
+            fillGalleryListByApi(task, okHttpClient, list);
         }
 
-        for (GalleryInfo info : result.galleryInfoList) {
+        for (GalleryInfo info : list) {
             info.thumb = EhUrl.getFixedPreviewThumbUrl(info.thumb);
         }
 
@@ -590,11 +592,12 @@ public class EhEngine {
             throw e;
         }
 
-        if (callApi && result.galleryInfoList.size() > 0) {
-            fillGalleryListByApi(task, okHttpClient, result.galleryInfoList);
+        List<GalleryInfo> list = result.galleryInfoList;
+        if (list.size() > 0 && (TextUtils.isEmpty(list.get(0).uploader) || Settings.getShowJpnTitle() || Settings.getShowGalleryPages())) {
+            fillGalleryListByApi(task, okHttpClient, list);
         }
 
-        for (GalleryInfo info : result.galleryInfoList) {
+        for (GalleryInfo info : list) {
             info.thumb = EhUrl.getFixedPreviewThumbUrl(info.thumb);
         }
 
@@ -907,7 +910,7 @@ public class EhEngine {
             }
         }
 
-        if (list.size() > 0 && (Settings.getShowJpnTitle() || Settings.getShowGalleryPages() || sEhFilter.needCallApi())) {
+        if (list.size() > 0 && (TextUtils.isEmpty(list.get(0).uploader) || Settings.getShowJpnTitle() || Settings.getShowGalleryPages() || sEhFilter.needCallApi())) {
             // Fill by api
             fillGalleryListByApi(task, okHttpClient, list);