diff options
author | Andrew Dolgov <[email protected]> | 2014-11-07 02:26:25 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2014-11-07 02:26:25 +0400 |
commit | b07b70f989ac0f4e8774c8ee9f3be9fea1613c65 (patch) | |
tree | 7d481bfc788c49ffdea3862a4dc33b1b2767472b /org.fox.ttrss/src/main/java | |
parent | 3ef8a660a84e19227c14f624be77ab6aa2a2f810 (diff) |
add missing pixmaps; remove headline empty view
Diffstat (limited to 'org.fox.ttrss/src/main/java')
3 files changed, 9 insertions, 5 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index 61d48ac3..633e52c2 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -241,7 +241,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo; ListView list = (ListView) getView().findViewById(R.id.feeds); - Feed feed = (Feed) list.getItemAtPosition(info.position); + Feed feed = (Feed) getFeedAtPosition(info.position); menu.setHeaderTitle(feed.display_title != null ? feed.display_title : feed.title); @@ -837,7 +837,11 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh public Feed getFeedAtPosition(int position) { try { - return m_adapter.getItem(position); + ListView list = (ListView) getView().findViewById(R.id.feeds); + + return (Feed) list.getItemAtPosition(position); + } catch (NullPointerException e) { + return null; } catch (IndexOutOfBoundsException e) { return null; } 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 646ac11e..5a6200be 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -457,9 +457,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (getView() != null) { ListView list = (ListView)getView().findViewById(R.id.headlines_list); - if (list != null) { + /* if (list != null) { list.setEmptyView(getView().findViewById(R.id.no_headlines)); - } + } */ } super.onPostExecute(result); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 324f57fb..2687223e 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -325,7 +325,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis list.setAdapter(m_adapter); list.setOnItemClickListener(this); list.setOnScrollListener(this); - list.setEmptyView(view.findViewById(R.id.no_headlines)); + //list.setEmptyView(view.findViewById(R.id.no_headlines)); registerForContextMenu(list); return view; |