diff options
Diffstat (limited to 'org.fox.ttrss/src')
5 files changed, 17 insertions, 9 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index d215d256..c1b92111 100644 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="274" - android:versionName="1.67" > + android:versionCode="276" + android:versionName="1.68" > <uses-sdk android:minSdkVersion="9" diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java index 431afe93..d3cffe21 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java @@ -359,7 +359,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe //m_adapter.notifyDataSetChanged(); (done by sortCats) //m_activity.setLoadingStatus(R.string.blank, false); - + return; } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java index ad959b48..07e6212b 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java @@ -39,6 +39,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe protected long m_lastRefresh = 0; private boolean m_feedIsSelected = false; + private boolean m_userFeedSelected = false; private ActionBarDrawerToggle m_drawerToggle; private DrawerLayout m_drawerLayout; @@ -114,7 +115,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe Feed tmpFeed = new Feed(feedId, feedTitle, isCat); - onFeedSelected(tmpFeed); + onFeedSelected(tmpFeed, false); } @Override @@ -160,6 +161,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe //m_actionbarUpEnabled = savedInstanceState.getBoolean("actionbarUpEnabled"); //m_actionbarRevertDepth = savedInstanceState.getInt("actionbarRevertDepth"); m_feedIsSelected = savedInstanceState.getBoolean("feedIsSelected"); + m_userFeedSelected = savedInstanceState.getBoolean("userFeedSelected"); //m_feedWasSelected = savedInstanceState.getBoolean("feedWasSelected"); /* if (findViewById(R.id.sw600dp_port_anchor) != null && m_feedWasSelected && m_slidingMenu != null) { @@ -212,8 +214,12 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe } } } - - public void onFeedSelected(Feed feed) { + + public void onFeedSelected(Feed feed) { + onFeedSelected(feed, true); + } + + public void onFeedSelected(Feed feed, final boolean selectedByUser) { GlobalState.getInstance().m_loadedArticles.clear(); //m_pullToRefreshAttacher.setRefreshing(true); @@ -238,6 +244,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe ft.commit(); m_feedIsSelected = true; + m_userFeedSelected = selectedByUser; //m_feedWasSelected = true; if (m_drawerLayout != null) { @@ -379,7 +386,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe @Override public void onBackPressed() { if (m_drawerLayout != null && !m_drawerLayout.isDrawerOpen(Gravity.START) && - getSupportFragmentManager().getBackStackEntryCount() > 0) { + (getSupportFragmentManager().getBackStackEntryCount() > 0 || m_userFeedSelected)) { m_drawerLayout.openDrawer(Gravity.START); } else { @@ -399,6 +406,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe super.onSaveInstanceState(out); out.putBoolean("feedIsSelected", m_feedIsSelected); + out.putBoolean("userFeedSelected", m_userFeedSelected); GlobalState.getInstance().save(out); } 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 633e52c2..31dc0ae4 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 @@ -568,7 +568,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh if (m_enableFeedIcons && !m_feedIconsChecked && Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) getFeedIcons(); - + return; } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java index 382d6baf..5e08f515 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java @@ -265,7 +265,7 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead @Override public void onBackPressed() { if (m_drawerLayout != null && !m_drawerLayout.isDrawerOpen(Gravity.START) && - getSupportFragmentManager().getBackStackEntryCount() > 0) { + (getSupportFragmentManager().getBackStackEntryCount() > 0 || m_feedIsSelected)) { m_drawerLayout.openDrawer(Gravity.START); } else { |