From d381abd82a4925e93fa48ddea36ef0f251150df4 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 24 Feb 2013 00:52:00 +0400 Subject: properly clear active article when going back from headlinesactivity in tablet mode bump version --- src/org/fox/ttrss/FeedsActivity.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/org/fox/ttrss/FeedsActivity.java b/src/org/fox/ttrss/FeedsActivity.java index 95ce5744..6e725e99 100644 --- a/src/org/fox/ttrss/FeedsActivity.java +++ b/src/org/fox/ttrss/FeedsActivity.java @@ -27,6 +27,8 @@ import android.widget.LinearLayout; public class FeedsActivity extends OnlineActivity implements HeadlinesEventListener { private final String TAG = this.getClass().getSimpleName(); + private static final int HEADLINES_REQUEST = 1; + protected SharedPreferences m_prefs; protected long m_lastRefresh = 0; @@ -328,7 +330,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe intent.putExtra("article", (Article)null); intent.putExtra("searchQuery", (String)null); - startActivityForResult(intent, 0); + startActivityForResult(intent, HEADLINES_REQUEST); overridePendingTransition(R.anim.right_slide_in, 0); } } @@ -360,7 +362,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe intent.putExtra("article", article); intent.putExtra("searchQuery", hf.getSearchQuery()); - startActivityForResult(intent, 0); + startActivityForResult(intent, HEADLINES_REQUEST); overridePendingTransition(R.anim.right_slide_in, 0); } } else { @@ -383,4 +385,11 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe // TODO Auto-generated method stub } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + if (requestCode == HEADLINES_REQUEST) { + GlobalState.getInstance().m_activeArticle = null; + } + } } -- cgit v1.2.3