fix article model allowing append load if lazy load is disabled

2 files changed, 4 insertions, 4 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java
index 0a4862d2..141b9680 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java
@@ -88,7 +88,7 @@ public class ArticleModel extends AndroidViewModel implements ApiCommon.ApiCalle
     }
 
     public void startLoading(boolean append, @NonNull Feed feed, int resizeWidth) {
-        Log.d(TAG, "startLoading append=" + append + " feed id=" + feed.id + " cat=" + feed.is_cat);
+        Log.d(TAG, "startLoading append=" + append + " feed id=" + feed.id + " cat=" + feed.is_cat + " lazyLoadEnabled=" + m_lazyLoadEnabled + " isLoading=" + m_isLoading.getValue());
 
         m_resizeWidth = resizeWidth;
 
@@ -98,7 +98,7 @@ public class ArticleModel extends AndroidViewModel implements ApiCommon.ApiCalle
             m_feed = feed;
 
             loadInBackground();
-        } else if (feed != m_feed || m_lazyLoadEnabled || !m_isLoading.getValue()) {
+        } else if (!m_isLoading.getValue() && (feed != m_feed || m_lazyLoadEnabled)) {
             m_append = true;
             m_feed = feed;
 
@@ -127,7 +127,7 @@ public class ArticleModel extends AndroidViewModel implements ApiCommon.ApiCalle
     }
 
     private void loadInBackground() {
-        Log.d(TAG, this + " loadInBackground append=" + m_append + " offset=" + m_offset);
+        Log.d(TAG, this + " loadInBackground append=" + m_append + " offset=" + m_offset + " lazyLoadEnabled=" + m_lazyLoadEnabled);
 
         ArticleList articlesWork = new ArticleList(m_articles.getValue());
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index c2d70fca..a5eb7e95 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -474,7 +474,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 		ArticleModel model = Application.getArticlesModel();
 
 		model.getIsLoading().observe(getActivity(), isLoading -> {
-			Log.d(TAG, "observed headlines isLoading=" + isLoading);
+			Log.d(TAG, "observed headlines isLoading=" + isLoading + " lazyLoadEnabled=" + model.isLazyLoadEnabled());
 
 			if (m_swipeLayout != null)
 				m_swipeLayout.setRefreshing(isLoading);