do nothing if setActiveArticleId passes invalid id, prevent force-clearing article list on refresh for now

1 files changed, 8 insertions, 6 deletions

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 04d1e93b..a62fa0dc 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
@@ -592,8 +592,8 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 			return;
 
 		if (!append) {
-			m_activeArticleId = -1;
-			Application.getArticlesModel().update(new ArticleList());
+			setActiveArticleId(-1);
+			//Application.getArticlesModel().update(new ArticleList());
 		}
 
 		model.setSearchQuery(getSearchQuery());
@@ -1562,12 +1562,14 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 			if (oldPosition != -1)
 				m_adapter.notifyItemChanged(oldPosition);
 
-			m_adapter.notifyItemChanged(newPosition);
+			if (newPosition != -1) {
+				m_adapter.notifyItemChanged(newPosition);
 
-			scrollToArticleId(articleId);
+				scrollToArticleId(articleId);
 
-			if (newPosition >= articles.size() - 5)
-				new Handler().postDelayed(() -> refresh(true), 0);
+				if (newPosition >= articles.size() - 5)
+					new Handler().postDelayed(() -> refresh(true), 0);
+			}
 		}
 	}