浏览代码

fix reloading bug

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 3 年之前
父节点
当前提交
307a407631

+ 3 - 3
src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.java

@@ -122,10 +122,10 @@ public class GallerySearchTask extends AsyncTask<Void, Void, GallerySearchTask.R
 
             photoFragment.setLoading(false);
 
-            if (!result.success || result.emptySearch) {
-                photoFragment.setEmptyListMessage(ExtendedListFragment.SearchType.GALLERY_SEARCH);
-            } else {
+            if (result.success) {
                 photoFragment.searchCompleted(result.emptySearch, result.lastTimestamp);
+            } else {
+                photoFragment.setEmptyListMessage(ExtendedListFragment.SearchType.GALLERY_SEARCH);
             }
         }
     }

+ 6 - 2
src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java

@@ -146,7 +146,7 @@ public class GalleryFragment extends OCFileListFragment {
     public void searchCompleted(boolean emptySearch, long lastTimeStamp) {
         photoSearchQueryRunning = false;
 
-        if (emptySearch) {
+        if (emptySearch && getAdapter().getItemCount() > 0) {
             Log_OC.d(this, "End gallery search");
             return;
         }
@@ -163,7 +163,10 @@ public class GalleryFragment extends OCFileListFragment {
             return;
         }
 
-        endDate = lastTimeStamp;
+        if (lastTimeStamp > -1) {
+            endDate = lastTimeStamp;
+        }
+
         startDate = endDate - (daySpan * 24 * 60 * 60);
 
         photoSearchTask = new GallerySearchTask(this,
@@ -199,6 +202,7 @@ public class GalleryFragment extends OCFileListFragment {
                     endDate = lastFile.getModificationTimestamp() / 1000;
                     startDate = endDate - (daySpan * 24 * 60 * 60);
 
+                    photoSearchQueryRunning = true;
                     photoSearchTask = new GallerySearchTask(this,
                                                             accountManager.getUser(),
                                                             mContainerActivity.getStorageManager(),