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;
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_published_special.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_published_special.png
new file mode 100644
index 00000000..21d48a33
Binary files /dev/null and b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_published_special.png differ
diff --git a/org.fox.ttrss/src/main/res/drawable/s_headline_published_special.svg b/org.fox.ttrss/src/main/res/drawable/s_headline_published_special.svg
new file mode 100644
index 00000000..2789cfa8
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable/s_headline_published_special.svg
@@ -0,0 +1,905 @@
+
+
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml b/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
index a9060aa8..d0c318f1 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
@@ -20,14 +20,15 @@
-
-
+ -->
\ No newline at end of file