diff options
4 files changed, 12 insertions, 32 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java index 63de9bf8..422e377c 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java @@ -245,14 +245,9 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList m_menu.findItem(R.id.search).setVisible(false); } } - - @Override - public void onArticleSelected(Article article) { - onArticleSelected(article, true); - } @Override - public void onArticleSelected(Article article, boolean open) { + public void onArticleSelected(Article article) { Article articleClone = new Article(article); @@ -262,8 +257,6 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList } Application.getArticlesModel().setActive(articleClone); - - if (!getSupportActionBar().isShowing()) getSupportActionBar().show(); } @Override 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 48ae7c8c..93324f6e 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -472,7 +472,7 @@ public class FeedsFragment extends Fragment implements OnSharedPreferenceChangeL return VIEW_DIVIDER; } else if (feed.id == Feed.TYPE_TOGGLE_UNREAD) { return VIEW_TOGGLE_UNREAD; - } else if (m_selectedFeed != null && feed.id == m_selectedFeed.id && feed.is_cat == m_selectedFeed.is_cat) { + } else if (feed.equals(m_selectedFeed)) { return VIEW_SELECTED; } else { return VIEW_NORMAL; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesEventListener.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesEventListener.java index 91a0fdc9..52498083 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesEventListener.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesEventListener.java @@ -4,7 +4,6 @@ import org.fox.ttrss.types.Article; public interface HeadlinesEventListener { void onArticleSelected(Article article); - void onArticleSelected(Article article, boolean open); void onHeadlinesLoaded(boolean appended); void onHeadlinesLoadingProgress(int progress); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index 66bf8cf8..28e90d53 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -80,8 +80,6 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList m_drawerLayout = findViewById(R.id.headlines_drawer); - Log.d(TAG, "LPP="+ m_loadingProgress + " DR=" + m_drawerLayout); - if (m_drawerLayout != null) { m_drawerToggle = new ActionBarDrawerToggle(this, m_drawerLayout, R.string.blank, R.string.blank) { @@ -89,9 +87,6 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList public void onDrawerOpened(View drawerView) { super.onDrawerOpened(drawerView); - getSupportActionBar().show(); - invalidateOptionsMenu(); - Date date = new Date(); if (date.getTime() - m_lastRefresh > 60*1000) { m_lastRefresh = date.getTime(); @@ -415,7 +410,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList } - public void onArticleSelected(Article article, boolean open) { + public void onArticleSelected(Article article) { Article articleClone = new Article(article); if (articleClone.unread) { @@ -423,19 +418,17 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList saveArticleUnread(articleClone); } - if (open) { - Application.getArticlesModel().setActive(articleClone); + Application.getArticlesModel().setActive(articleClone); - if (m_prefs.getBoolean("always_open_uri", false)) { - openUri(Uri.parse(article.link)); - } else { - Intent intent = new Intent(MasterActivity.this, DetailActivity.class); - intent.putExtra("feed", m_activeFeed); + if (m_prefs.getBoolean("always_open_uri", false)) { + openUri(Uri.parse(article.link)); + } else { + Intent intent = new Intent(MasterActivity.this, DetailActivity.class); + intent.putExtra("feed", m_activeFeed); - startActivityForResult(intent, HEADLINES_REQUEST); - overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left); - } - } + startActivityForResult(intent, HEADLINES_REQUEST); + overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left); + } } @Override @@ -452,11 +445,6 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList } - @Override - public void onArticleSelected(Article article) { - onArticleSelected(article, true); - } - @Override public void onHeadlinesLoaded(boolean appended) { setLoadingVisible(false); |