always return actual article POJO from model list in get active

1 files changed, 8 insertions, 1 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 1e004f99..366a8fa8 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
@@ -92,7 +92,14 @@ public class ArticleModel extends AndroidViewModel implements ApiCommon.ApiCalle
     }
 
     public Article getActiveArticle() {
-        return m_activeArticle.getValue();
+        ArticleList articles = m_articles.getValue();
+
+        try {
+            // always get uptodate item from model list
+            return articles.get(articles.indexOf(m_activeArticle.getValue()));
+        } catch (ArrayIndexOutOfBoundsException e) {
+            return null;
+        }
     }
 
     // we store .active flag in articleview for UI update and a separate observable for easy access