From 8c19ec257c8df6cc13a19e4df674423ec4644cc1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 25 Nov 2011 11:47:07 +0300 Subject: fix article timestamp in headlines displayed in UTC use custom back button handling to prevent backstack idiocy --- src/org/fox/ttrss/MainActivity.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/org/fox/ttrss/MainActivity.java') 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; @@ -175,6 +176,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()) { -- cgit v1.2.3-54-g00ecf