From 943603e45779e8c6e7a8b101b67ea8755238473a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 20 May 2025 21:53:10 +0300
Subject: drop no longer useful variant of onArticleSelected(), remove
 seemingly pointless actionbar show() since we never hide it, stop
 invalidating menu on drawer open

---
 .../main/java/org/fox/ttrss/DetailActivity.java    |  9 +------
 .../java/org/fox/ttrss/HeadlinesEventListener.java |  1 -
 .../main/java/org/fox/ttrss/MasterActivity.java    | 30 ++++++++--------------
 3 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
index 63de9bf8..422e377c 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
@@ -245,14 +245,9 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
 			m_menu.findItem(R.id.search).setVisible(false);
 		}		
 	}
-	
-	@Override
-	public void onArticleSelected(Article article) {
-		onArticleSelected(article, true);
-	}
 
 	@Override
-	public void onArticleSelected(Article article, boolean open) {
+	public void onArticleSelected(Article article) {
 
 		Article articleClone = new Article(article);
 
@@ -262,8 +257,6 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
 		}
 
 		Application.getArticlesModel().setActive(articleClone);
-
-		if (!getSupportActionBar().isShowing()) getSupportActionBar().show();
 	}
 
 	@Override
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesEventListener.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesEventListener.java
index 91a0fdc9..52498083 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesEventListener.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesEventListener.java
@@ -4,7 +4,6 @@ import org.fox.ttrss.types.Article;
 
 public interface HeadlinesEventListener {
 	void onArticleSelected(Article article);
-	void onArticleSelected(Article article, boolean open);
 	void onHeadlinesLoaded(boolean appended);
 	void onHeadlinesLoadingProgress(int progress);
 }
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
index 66bf8cf8..436ae734 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
@@ -89,9 +89,6 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
                 public void onDrawerOpened(View drawerView) {
                     super.onDrawerOpened(drawerView);
 
-                    getSupportActionBar().show();
-                    invalidateOptionsMenu();
-
 					Date date = new Date();
 					if (date.getTime() - m_lastRefresh > 60*1000) {
 						m_lastRefresh = date.getTime();
@@ -415,7 +412,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
 
 	}
 
-	public void onArticleSelected(Article article, boolean open) {
+	public void onArticleSelected(Article article) {
 		Article articleClone = new Article(article);
 
 		if (articleClone.unread) {
@@ -423,19 +420,17 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
 			saveArticleUnread(articleClone);
 		}
 
-		if (open) {
-			Application.getArticlesModel().setActive(articleClone);
+		Application.getArticlesModel().setActive(articleClone);
 
-            if (m_prefs.getBoolean("always_open_uri", false)) {
-				openUri(Uri.parse(article.link));
-			} else {
-                Intent intent = new Intent(MasterActivity.this, DetailActivity.class);
-				intent.putExtra("feed", m_activeFeed);
+		if (m_prefs.getBoolean("always_open_uri", false)) {
+			openUri(Uri.parse(article.link));
+		} else {
+			Intent intent = new Intent(MasterActivity.this, DetailActivity.class);
+			intent.putExtra("feed", m_activeFeed);
 
-				startActivityForResult(intent, HEADLINES_REQUEST);
-				overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
-			}
-	    }
+			startActivityForResult(intent, HEADLINES_REQUEST);
+			overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
+		}
 	}
 
     @Override
@@ -452,11 +447,6 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
 
     }
 
-    @Override
-	public void onArticleSelected(Article article) {
-		onArticleSelected(article, true);		
-	}
-
 	@Override
 	public void onHeadlinesLoaded(boolean appended) {
 		setLoadingVisible(false);
-- 
cgit v1.2.3-54-g00ecf