when exiting detail activity, pass active article back to main activity and select it in headlines list

2 files changed, 8 insertions, 4 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 f2f43001..e7c5f352 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
@@ -380,7 +380,7 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
 	public void onBackPressed() {
         Intent resultIntent = new Intent();
 
-        resultIntent.putExtra("activeArticle", m_activeArticle);
+        Application.getInstance().tmpActiveArticle = m_activeArticle;
 
         setResult(Activity.RESULT_OK, resultIntent);
 
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 3d531239..969df072 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
@@ -527,10 +527,14 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
 
-		HeadlinesFragment hf = (HeadlinesFragment)getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES);
+		if (requestCode == HEADLINES_REQUEST) {
+			HeadlinesFragment hf = (HeadlinesFragment) getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES);
 
-		if (hf != null) {
-			hf.notifyUpdated();
+			if (hf != null) {
+				hf.notifyUpdated();
+
+				hf.setActiveArticle(Application.getInstance().tmpActiveArticle);
+			}
 		}
 	}