switch to static usages, refactor method name

3 files changed, 14 insertions, 14 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java
index 441929f4..ad6dbb93 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java
@@ -25,18 +25,18 @@ public class Application extends android.app.Application {
 	private int m_apiLevel;
 	public LinkedHashMap<String, String> m_customSortModes = new LinkedHashMap<>();
 	ConnectivityManager m_cmgr;
-	ArticlesModel m_headlinesModel;
+	ArticlesModel m_articlesModel;
 
 	public static Application getInstance(){
 		return m_singleton;
 	}
 
 	public static ArticleList getArticles() {
-		return getInstance().m_headlinesModel.getArticles();
+		return getInstance().m_articlesModel.getArticles();
 	}
 
-	public static ArticlesModel getHeadlinesModel() {
-		return getInstance().m_headlinesModel;
+	public static ArticlesModel getArticlesModel() {
+		return getInstance().m_articlesModel;
 	}
 
 	@Override
@@ -45,7 +45,7 @@ public class Application extends android.app.Application {
 
 		m_singleton = this;
 		m_cmgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-		m_headlinesModel = new ArticlesModel(this);
+		m_articlesModel = new ArticlesModel(this);
 	}
 
 	public String getSessionId() {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
index 77b7d9aa..d2978858 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
@@ -82,7 +82,7 @@ public class ArticlePager extends androidx.fragment.app.Fragment {
 		m_adapter = new PagerAdapter(this);
 		m_adapter.submitList(Application.getArticles());
 
-		ArticlesModel model = Application.getInstance().getHeadlinesModel();
+		ArticlesModel model = Application.getArticlesModel();
 
 		// deal with further updates
 		model.getArticlesData().observe(getActivity(), articles -> {
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 8fece790..da1c160b 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
@@ -356,7 +356,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 							ArticleList tmpRemove = new ArticleList(Application.getArticles());
 							tmpRemove.remove(adapterPosition);
 
-							Application.getInstance().getHeadlinesModel().update(tmpRemove);
+							Application.getArticlesModel().update(tmpRemove);
 
 							Snackbar.make(m_list, R.string.headline_undo_row_prompt, Snackbar.LENGTH_LONG)
 									.setAction(getString(R.string.headline_undo_row_button), v -> {
@@ -369,7 +369,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 										ArticleList tmpInsert = new ArticleList(Application.getArticles());
 										tmpInsert.add(adapterPosition, article);
 
-										Application.getInstance().getHeadlinesModel().update(tmpInsert);
+										Application.getArticlesModel().update(tmpInsert);
                                     }).show();
 
 						}
@@ -389,7 +389,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 			public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
 				super.onScrollStateChanged(recyclerView, newState);
 
-				ArticlesModel model = Application.getInstance().getHeadlinesModel();
+				ArticlesModel model = Application.getArticlesModel();
 
 				if (newState == RecyclerView.SCROLL_STATE_IDLE) {
 					if (!m_readArticles.isEmpty() && !m_isLazyLoading && !model.isLoading() && m_prefs.getBoolean("headlines_mark_read_scroll", false)) {
@@ -438,7 +438,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 					// Log.d(TAG, "pending to auto mark as read count=" + m_readArticles.size());
 				}
 
-				ArticlesModel model = Application.getInstance().getHeadlinesModel();
+				ArticlesModel model = Application.getArticlesModel();
 
 				if (dy > 0 && !m_isLazyLoading && !model.isLoading() && model.lazyLoadEnabled() &&
 						lastVisibleItem >= Application.getArticles().size() - 5) {
@@ -457,7 +457,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
             m_activity.setTitle(m_feed.title);
         }
 
-		ArticlesModel model = Application.getHeadlinesModel();
+		ArticlesModel model = Application.getArticlesModel();
 
 		// this gets notified on network update
 		model.getUpdatesData().observe(getActivity(), lastUpdate -> {
@@ -542,7 +542,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 	}
 
 	public void refresh(final boolean append) {
-		ArticlesModel model = Application.getInstance().getHeadlinesModel();
+		ArticlesModel model = Application.getArticlesModel();
 
 		if (!append)
 			m_activeArticleId = -1;
@@ -846,7 +846,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 					selectedArticle.marked = !selectedArticle.marked;
 
                     m_activity.saveArticleMarked(selectedArticle);
-					Application.getHeadlinesModel().update(position, selectedArticle);
+					Application.getArticlesModel().update(position, selectedArticle);
                 });
 			}
 
@@ -912,7 +912,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 
 					m_activity.saveArticlePublished(selectedArticle);
 
-					Application.getHeadlinesModel().update(position, selectedArticle);
+					Application.getArticlesModel().update(position, selectedArticle);
                 });
 			}