properly clear active article when going back from headlinesactivity in

tablet mode
bump version

2 files changed, 13 insertions, 4 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a5c29dec..06a915dd 100644
--- a/AndroidManifest.xml
+++ b/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="137"
-    android:versionName="1.15" >
+    android:versionCode="138"
+    android:versionName="1.16" >
 
     <uses-sdk
         android:minSdkVersion="8"
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;			

+		}		

+	}

 }