fix article timestamp in headlines displayed in UTC

use custom back button handling to prevent backstack idiocy

1 files changed, 17 insertions, 0 deletions

diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index c7dd18c9..f689c851 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -11,6 +11,7 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -176,6 +177,22 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect
 	}
 	
 	@Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+        	Log.d(TAG, "Overriding back button");
+        	
+        	if (m_selectedArticle != null) {
+        		closeArticle();
+        	} else {
+        		finish();
+        	}
+
+        	return false;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+	
+	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 		case R.id.preferences: