From d3320e66ecf4bc720a7844748627c97acfd3d347 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 18 Sep 2012 15:35:24 +0400
Subject: disable search in HeadlinesActivity

---
 src/org/fox/ttrss/HeadlinesActivity.java |   6 ++
 src/org/fox/ttrss/HeadlinesFragment.java | 112 ++++++++++++++++---------------
 2 files changed, 63 insertions(+), 55 deletions(-)

(limited to 'src/org')

diff --git a/src/org/fox/ttrss/HeadlinesActivity.java b/src/org/fox/ttrss/HeadlinesActivity.java
index 0f92a487..18317caf 100644
--- a/src/org/fox/ttrss/HeadlinesActivity.java
+++ b/src/org/fox/ttrss/HeadlinesActivity.java
@@ -121,6 +121,12 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
 			Fragment af = getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE);
 			
 			m_menu.setGroupVisible(R.id.menu_group_article, af != null);
+			
+			m_menu.findItem(R.id.search).setVisible(false);
+			
+			if (!isCompatMode()) {
+				m_menu.findItem(R.id.headlines_select).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+			}
 		}		
 	}
 	
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index 9cc1c41f..3a18dc07 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -350,65 +350,67 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 
 	@SuppressWarnings({ "unchecked", "serial" })
 	public void refresh(boolean append) {
-		m_refreshInProgress = true;
-		
-		HeadlinesRequest req = new HeadlinesRequest(getActivity().getApplicationContext(), m_activity) {
-			protected void onPostExecute(JsonElement result) {
-				super.onPostExecute(result);
-				m_refreshInProgress = false;
-				m_adapter.notifyDataSetChanged();
-				m_listener.onHeadlinesLoaded();
+		if (m_activity != null) {
+			m_refreshInProgress = true;
+			
+			HeadlinesRequest req = new HeadlinesRequest(getActivity().getApplicationContext(), m_activity) {
+				protected void onPostExecute(JsonElement result) {
+					super.onPostExecute(result);
+					m_refreshInProgress = false;
+					m_adapter.notifyDataSetChanged();
+					m_listener.onHeadlinesLoaded();
+				}
+			};
+			
+			final String sessionId = m_activity.getSessionId();
+			final boolean showUnread = m_activity.getUnreadArticlesOnly();
+			final boolean isCat = m_feed.is_cat;
+			int skip = 0;
+			
+			if (!m_feed.equals(GlobalState.getInstance().m_activeFeed)) {
+				append = false;
 			}
-		};
-		
-		final String sessionId = m_activity.getSessionId();
-		final boolean showUnread = m_activity.getUnreadArticlesOnly();
-		final boolean isCat = m_feed.is_cat;
-		int skip = 0;
-		
-		if (!m_feed.equals(GlobalState.getInstance().m_activeFeed)) {
-			append = false;
-		}
-		
-		if (append) {
-			for (Article a : m_articles) {
-				if (a.unread) ++skip;
+			
+			if (append) {
+				for (Article a : m_articles) {
+					if (a.unread) ++skip;
+				}
+				
+				if (skip == 0) skip = m_articles.size();
+			} else {
+				setLoadingStatus(R.string.blank, true);
 			}
 			
-			if (skip == 0) skip = m_articles.size();
-		} else {
-			setLoadingStatus(R.string.blank, true);
+			final int fskip = skip;
+			
+			req.setOffset(skip);
+			
+			HashMap<String,String> map = new HashMap<String,String>() {
+				{
+					put("op", "getHeadlines");
+					put("sid", sessionId);
+					put("feed_id", String.valueOf(m_feed.id));
+					put("show_content", "true");
+					put("include_attachments", "true");
+					put("limit", String.valueOf(HEADLINES_REQUEST_SIZE));
+					put("offset", String.valueOf(0));
+					put("view_mode", showUnread ? "adaptive" : "all_articles");
+					put("skip", String.valueOf(fskip));
+					put("include_nested", "true");
+					
+					if (isCat) put("is_cat", "true");
+					
+					if (m_searchQuery != null && m_searchQuery.length() != 0) {
+						put("search", m_searchQuery);
+						put("search_mode", "");
+						put("match_on", "both");
+					}
+				}			 
+			};
+	
+			req.execute(map);
 		}
-		
-		final int fskip = skip;
-		
-		req.setOffset(skip);
-		
-		HashMap<String,String> map = new HashMap<String,String>() {
-			{
-				put("op", "getHeadlines");
-				put("sid", sessionId);
-				put("feed_id", String.valueOf(m_feed.id));
-				put("show_content", "true");
-				put("include_attachments", "true");
-				put("limit", String.valueOf(HEADLINES_REQUEST_SIZE));
-				put("offset", String.valueOf(0));
-				put("view_mode", showUnread ? "adaptive" : "all_articles");
-				put("skip", String.valueOf(fskip));
-				put("include_nested", "true");
-				
-				if (isCat) put("is_cat", "true");
-				
-				if (m_searchQuery != null && m_searchQuery.length() != 0) {
-					put("search", m_searchQuery);
-					put("search_mode", "");
-					put("match_on", "both");
-				}
-			}			 
-		};
-
-		req.execute(map);
-	}
+	}		
 
 	@Override
 	public void onSaveInstanceState (Bundle out) {
-- 
cgit v1.2.3