1 files changed, 31 insertions, 33 deletions
diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java
index 3e254535..4b34ed62 100644
--- a/src/org/fox/ttrss/CommonActivity.java
+++ b/src/org/fox/ttrss/CommonActivity.java
@@ -2,15 +2,15 @@ package org.fox.ttrss;
 
 import org.fox.ttrss.util.DatabaseHelper;
 
-import android.content.SharedPreferences;
+import android.annotation.SuppressLint;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentActivity;
 import android.util.DisplayMetrics;
 import android.util.FloatMath;
 import android.util.Log;
 import android.view.Display;
+import android.widget.TextView;
 import android.widget.Toast;
 
 public class CommonActivity extends FragmentActivity {
@@ -21,20 +21,43 @@ public class CommonActivity extends FragmentActivity {
 	public final static String FRAG_FEEDS = "feeds";
 	public final static String FRAG_CATS = "cats";
 	
-	private SharedPreferences m_prefs;
-
 	private SQLiteDatabase m_readableDb;
 	private SQLiteDatabase m_writableDb;
 
 	private boolean m_smallScreenMode = true;
 	private boolean m_compatMode = false;
-	private boolean m_smallTablet = false;
 
 	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;
+	}
+	
+	public void setUnreadOnly(boolean unread) {
+		GlobalState.getInstance().m_unreadOnly = unread;
+	}
+
+	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);
+
+		if (tv != null) {
+			tv.setText(status);
+		}
+		
+		setProgressBarIndeterminateVisibility(showProgress);
+	}
+	
 	public void toast(int msgId) {
 		Toast toast = Toast.makeText(CommonActivity.this, msgId, Toast.LENGTH_SHORT);
 		toast.show();
@@ -45,23 +68,6 @@ public class CommonActivity extends FragmentActivity {
 		toast.show();
 	}
 
-	protected void detectSmallTablet() {
-
-		DisplayMetrics displayMetrics = new DisplayMetrics();
-		getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-
-		float inHeight = displayMetrics.heightPixels / displayMetrics.ydpi;
-		float inWidth = displayMetrics.widthPixels / displayMetrics.xdpi;
-		
-		float inDiag = FloatMath.sqrt(inHeight * inHeight + inWidth * inWidth);
-		
-		if (inDiag < 9 || m_prefs.getBoolean("force_small_tablet_ui", false)) {
-			m_smallTablet = true;
-		}
-		
-		Log.d(TAG, "m_smallTabletMode=" + m_smallTablet + " " + inDiag);
-	}
-	
 	private void initDatabase() {
 		DatabaseHelper dh = new DatabaseHelper(getApplicationContext());
 		
@@ -83,7 +89,6 @@ public class CommonActivity extends FragmentActivity {
 
 		m_readableDb.close();
 		m_writableDb.close();
-
 	}
 
 	@Override
@@ -92,13 +97,8 @@ public class CommonActivity extends FragmentActivity {
 		
 		m_compatMode = android.os.Build.VERSION.SDK_INT <= 10;
 
-		m_prefs = PreferenceManager
-				.getDefaultSharedPreferences(getApplicationContext());
-		
 		Log.d(TAG, "m_compatMode=" + m_compatMode);
 		
-		detectSmallTablet();
-		
 		super.onCreate(savedInstanceState);
 	}
 	
@@ -106,14 +106,11 @@ public class CommonActivity extends FragmentActivity {
 		return m_smallScreenMode;
 	}
 	
-	public boolean isSmallTablet() {
-		return m_smallTablet;
-	}
-
 	public boolean isCompatMode() {
 		return m_compatMode;
 	}
 
+	@SuppressWarnings("deprecation")
 	public boolean isPortrait() {
 		Display display = getWindowManager().getDefaultDisplay(); 
 		
@@ -123,9 +120,10 @@ public class CommonActivity extends FragmentActivity {
 	    return width < height;
 	}
 
+	@SuppressLint("NewApi")
+	@SuppressWarnings("deprecation")
 	public void copyToClipboard(String str) {
 		if (android.os.Build.VERSION.SDK_INT < 11) {				
-			@SuppressWarnings("deprecation")
 			android.text.ClipboardManager clipboard = (android.text.ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
 			clipboard.setText(str);
 		} else {