diff options
author | Andrew Dolgov <[email protected]> | 2013-10-18 00:53:18 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-10-18 00:53:18 +0400 |
commit | 0a7c9640d72c156c5496326d802eaae89a9bf658 (patch) | |
tree | 0c20322f06db5ca9eeb198bcc831c8b710dd181a /src/org | |
parent | cc67716030f04c014b6a36be33318676c2f91872 (diff) |
Revert "bump version"
This reverts commit cc67716030f04c014b6a36be33318676c2f91872.
Diffstat (limited to 'src/org')
-rw-r--r-- | src/org/fox/ttrss/FeedsFragment.java | 2 | ||||
-rw-r--r-- | src/org/fox/ttrss/HeadlinesFragment.java | 33 |
2 files changed, 1 insertions, 34 deletions
diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java index d9daddaf..fe6ba048 100644 --- a/src/org/fox/ttrss/FeedsFragment.java +++ b/src/org/fox/ttrss/FeedsFragment.java @@ -67,7 +67,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh private FeedsActivity m_activity; private Feed m_selectedFeed; private FeedCategory m_activeCategory; - protected static final String ICON_PATH = "/icons/"; + private static final String ICON_PATH = "/icons/"; private boolean m_enableFeedIcons; private boolean m_feedIconsChecked = false; diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 0e7e9fa1..c23889aa 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -1,6 +1,5 @@ package org.fox.ttrss; -import java.io.File; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -20,8 +19,6 @@ import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; import android.content.res.Resources.Theme; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.graphics.Paint; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; @@ -74,7 +71,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, private ArticleList m_readArticles = new ArticleList(); private HeadlinesEventListener m_listener; private OnlineActivity m_activity; - public boolean m_enableFeedIcons; private ImageGetter m_dummyGetter = new ImageGetter() { @@ -85,8 +81,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } }; - - public ArticleList getSelectedArticles() { return m_selectedArticles; } @@ -295,8 +289,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, list.setLayoutAnimation(controller); } */ - m_enableFeedIcons = m_prefs.getBoolean("download_feed_icons", false); - list.setAdapter(m_adapter); list.setOnItemClickListener(this); list.setOnScrollListener(this); @@ -693,31 +685,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } - ImageView feedIcon = (ImageView)v.findViewById(R.id.feed_icon); - - if (feedIcon != null) { - if (!m_activity.isSmallScreen() && m_enableFeedIcons && article.feed_title != null && (m_feed.is_cat || m_feed.id < 0)) { - - try { - File storage = m_activity.getExternalCacheDir(); - - File iconFile = new File(storage.getAbsolutePath() + FeedsFragment.ICON_PATH + article.feed_id + ".ico"); - if (iconFile.exists()) { - Bitmap bmpOrig = BitmapFactory.decodeFile(iconFile.getAbsolutePath()); - if (bmpOrig != null) { - feedIcon.setImageBitmap(bmpOrig); - } - } - } catch (NullPointerException e) { - - } - - } else { - feedIcon.setVisibility(View.GONE); - } - - } - ImageView marked = (ImageView)v.findViewById(R.id.marked); if (marked != null) { |