Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS-for-Honeycomb

1 files changed, 4 insertions, 8 deletions

diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java
index 02ac2104..92beaf97 100644
--- a/src/org/fox/ttrss/FeedsFragment.java
+++ b/src/org/fox/ttrss/FeedsFragment.java
@@ -7,7 +7,6 @@ import java.io.InputStream;
 import java.lang.reflect.Type;

 import java.net.MalformedURLException;

 import java.net.URL;

-import java.net.URLConnection;

 import java.util.ArrayList;

 import java.util.Collections;

 import java.util.Comparator;

@@ -21,18 +20,16 @@ import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CredentialsProvider;

 import org.apache.http.client.methods.HttpGet;

 import org.apache.http.client.protocol.ClientContext;

-import org.apache.http.conn.scheme.PlainSocketFactory;

 import org.apache.http.conn.scheme.Scheme;

-import org.apache.http.conn.scheme.SchemeRegistry;

 import org.apache.http.impl.client.BasicCredentialsProvider;

-import org.apache.http.impl.client.DefaultHttpClient;

-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;

-import org.apache.http.params.BasicHttpParams;

-import org.apache.http.params.HttpParams;

 import org.apache.http.protocol.BasicHttpContext;

 import org.apache.http.protocol.HttpContext;

+import org.fox.ttrss.types.Feed;

+import org.fox.ttrss.types.FeedCategory;

+import org.fox.ttrss.util.EasySSLSocketFactory;

 

 import android.app.Activity;

+import android.app.Fragment;

 import android.content.Context;

 import android.content.SharedPreferences;

 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;

@@ -43,7 +40,6 @@ import android.os.AsyncTask;
 import android.os.Bundle;

 import android.os.Environment;

 import android.preference.PreferenceManager;

-import android.support.v4.app.Fragment;

 import android.util.Log;

 import android.view.ContextMenu;

 import android.view.ContextMenu.ContextMenuInfo;