diff options
Diffstat (limited to 'org.fox.ttrss/src')
3 files changed, 36 insertions, 7 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java index 1fb918ed..c6133f8f 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java @@ -87,7 +87,14 @@ public class ArticlePager extends Fragment { public void setSearchQuery(String searchQuery) { m_searchQuery = searchQuery; } - + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setRetainInstance(true); + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.article_pager, container, false); 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 9e9cf243..19fcaeed 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -279,7 +279,14 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, super.onCreateContextMenu(menu, v, menuInfo); } - + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setRetainInstance(true); + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { 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 51781582..c7829b23 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -38,6 +38,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList protected SharedPreferences m_prefs; protected long m_lastRefresh = 0; + protected long m_lastWidgetRefresh = 0; private boolean m_feedIsSelected = false; private boolean m_userFeedSelected = false; @@ -64,6 +65,8 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList Application.getInstance().load(savedInstanceState); + m_lastWidgetRefresh = new Date().getTime(); + m_drawerLayout = (DrawerLayout) findViewById(R.id.headlines_drawer); if (m_drawerLayout != null) { @@ -151,7 +154,12 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList if (m_prefs.getBoolean("open_fresh_on_startup", true)) { HeadlinesFragment hf = new HeadlinesFragment(); - hf.initialize(new Feed(-3, getString(R.string.fresh_articles), false)); + + if (BuildConfig.DEBUG) { + hf.initialize(new Feed(-4, "All articles", false)); + } else { + hf.initialize(new Feed(-3, getString(R.string.fresh_articles), false)); + } ft.replace(R.id.headlines_fragment, hf, FRAG_HEADLINES); } else if (m_drawerLayout != null) { @@ -471,11 +479,18 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList } @Override - public void onStop() { - super.onStop(); + public void onPause() { + super.onPause(); + + Date date = new Date(); + + if (isFinishing() || date.getTime() - m_lastWidgetRefresh > 60*1000) { + m_lastWidgetRefresh = date.getTime(); + + Intent updateWidgetIntent = new Intent(SmallWidgetProvider.ACTION_REQUEST_UPDATE); + sendBroadcast(updateWidgetIntent); + } - Intent updateWidgetIntent = new Intent(SmallWidgetProvider.ACTION_REQUEST_UPDATE); - sendBroadcast(updateWidgetIntent); } @Override |