summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-02-27 10:39:23 +0400
committerAndrew Dolgov <[email protected]>2013-02-27 10:39:23 +0400
commit72975a9a030d1b5d3c36789fa8d1f5159f91170d (patch)
tree86fb3e379353f68f0db10431193182f32d45b822 /src
parentd381abd82a4925e93fa48ddea36ef0f251150df4 (diff)
properly report when feeds/cats list is empty, bump version
Diffstat (limited to 'src')
-rw-r--r--src/org/fox/ttrss/FeedCategoriesFragment.java9
-rw-r--r--src/org/fox/ttrss/FeedsFragment.java11
2 files changed, 19 insertions, 1 deletions
diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java
index 7db81a4e..a60bf617 100644
--- a/src/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/src/org/fox/ttrss/FeedCategoriesFragment.java
@@ -258,6 +258,14 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
m_activity.setProgressBarVisibility(false);
+ if (getView() != null) {
+ ListView list = (ListView)getView().findViewById(R.id.feeds);
+
+ if (list != null) {
+ list.setEmptyView(getView().findViewById(R.id.no_feeds));
+ }
+ }
+
if (result != null) {
try {
JsonArray content = result.getAsJsonArray();
@@ -285,6 +293,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
setLoadingStatus(R.string.no_feeds_to_display, false);
else */
+ m_adapter.notifyDataSetInvalidated();
m_activity.setLoadingStatus(R.string.blank, false);
return;
diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java
index 62f0669e..8dc28787 100644
--- a/src/org/fox/ttrss/FeedsFragment.java
+++ b/src/org/fox/ttrss/FeedsFragment.java
@@ -391,6 +391,14 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
@Override
protected void onPostExecute(JsonElement result) {
if (isDetached()) return;
+
+ if (getView() != null) {
+ ListView list = (ListView)getView().findViewById(R.id.feeds);
+
+ if (list != null) {
+ list.setEmptyView(getView().findViewById(R.id.no_feeds));
+ }
+ }
m_activity.setProgressBarVisibility(false);
@@ -415,7 +423,8 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
else */
m_activity.setLoadingStatus(R.string.blank, false);
-
+ m_adapter.notifyDataSetInvalidated();
+
if (m_enableFeedIcons && !m_feedIconsChecked &&
Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()))
getFeedIcons();