From 22302be4f9e5f28a13bdbe7fbbd58f9d3f7ca194 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 4 Apr 2013 10:41:34 +0400
Subject: [PATCH] make sure show_unread_only setting persists, bump version

---
 AndroidManifest.xml                   |  4 ++--
 src/org/fox/ttrss/ArticlePager.java   |  1 -
 src/org/fox/ttrss/CommonActivity.java | 21 +++++++++++----------
 src/org/fox/ttrss/GlobalState.java    |  2 --
 src/org/fox/ttrss/OnlineActivity.java |  6 ++++--
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 79a666d2..860097fe 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="155"
-    android:versionName="1.4.5" >
+    android:versionCode="156"
+    android:versionName="1.4.6" >
 
     <uses-sdk
         android:minSdkVersion="8"
diff --git a/src/org/fox/ttrss/ArticlePager.java b/src/org/fox/ttrss/ArticlePager.java
index 8fc57e4f..13105820 100644
--- a/src/org/fox/ttrss/ArticlePager.java
+++ b/src/org/fox/ttrss/ArticlePager.java
@@ -194,7 +194,6 @@ public class ArticlePager extends Fragment {
 		final Feed feed = m_feed;
 		
 		final String sessionId = m_activity.getSessionId();
-		final boolean showUnread = m_activity.getUnreadArticlesOnly();
 		int skip = 0;
 		
 		if (append) {
diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java
index 5c18f383..885f2266 100644
--- a/src/org/fox/ttrss/CommonActivity.java
+++ b/src/org/fox/ttrss/CommonActivity.java
@@ -3,8 +3,10 @@ package org.fox.ttrss;
 import org.fox.ttrss.util.DatabaseHelper;
 
 import android.annotation.SuppressLint;
+import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 import android.view.Display;
@@ -26,27 +28,23 @@ public class CommonActivity extends FragmentActivity {
 	private boolean m_smallScreenMode = true;
 	private boolean m_compatMode = false;
 
+	protected SharedPreferences m_prefs;
+
 	protected void setSmallScreen(boolean smallScreen) {
 		Log.d(TAG, "m_smallScreenMode=" + smallScreen);
 		m_smallScreenMode = smallScreen;
 	}
 	
-	public boolean getUnreadArticlesOnly() {
-		return GlobalState.getInstance().m_unreadArticlesOnly;
-	}
-	
 	public boolean getUnreadOnly() {
-		return GlobalState.getInstance().m_unreadOnly;
+		return m_prefs.getBoolean("show_unread_only", false);
 	}
 	
 	public void setUnreadOnly(boolean unread) {
-		GlobalState.getInstance().m_unreadOnly = unread;
+		SharedPreferences.Editor editor = m_prefs.edit();
+		editor.putBoolean("show_unread_only", unread);
+		editor.commit();
 	}
 
-	public void setUnreadArticlesOnly(boolean unread) {
-		GlobalState.getInstance().m_unreadArticlesOnly = unread;
-	}
-	
 	public void setLoadingStatus(int status, boolean showProgress) {
 		TextView tv = (TextView) findViewById(R.id.loading_message);
 
@@ -94,6 +92,9 @@ public class CommonActivity extends FragmentActivity {
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		m_prefs = PreferenceManager
+				.getDefaultSharedPreferences(getApplicationContext());
+
 		initDatabase();
 		
 		m_compatMode = android.os.Build.VERSION.SDK_INT <= 10;
diff --git a/src/org/fox/ttrss/GlobalState.java b/src/org/fox/ttrss/GlobalState.java
index 5080e449..d997cdc5 100644
--- a/src/org/fox/ttrss/GlobalState.java
+++ b/src/org/fox/ttrss/GlobalState.java
@@ -17,8 +17,6 @@ public class GlobalState extends Application {
 	public Feed m_activeFeed;
 	public Article m_activeArticle;
 	public int m_selectedArticleId;
-	public boolean m_unreadOnly = true;
-	public boolean m_unreadArticlesOnly = true;
 	public String m_sessionId;
 	public int m_apiLevel;
 	public boolean m_canUseProgress;
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java
index b33082e0..13b2925c 100644
--- a/src/org/fox/ttrss/OnlineActivity.java
+++ b/src/org/fox/ttrss/OnlineActivity.java
@@ -133,10 +133,11 @@ public class OnlineActivity extends CommonActivity {
 	
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		ApiRequest.disableConnectionReuseIfNecessary();
+		
+		// we use that before parent onCreate so let's init locally
 		m_prefs = PreferenceManager
 				.getDefaultSharedPreferences(getApplicationContext());
-
-		ApiRequest.disableConnectionReuseIfNecessary();
 		
 		if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) {
 			setTheme(R.style.DarkTheme);
@@ -1605,4 +1606,5 @@ public class OnlineActivity extends CommonActivity {
 	public String getLastContentImageHitTestUrl() {
 		return m_lastImageHitTestUrl;
 	}
+
 }