2 files changed, 5 insertions, 49 deletions
diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetClient.java b/src/de/danoeh/antennapod/gpoddernet/GpodnetClient.java
deleted file mode 100644
index 845a23823..000000000
--- a/src/de/danoeh/antennapod/gpoddernet/GpodnetClient.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package de.danoeh.antennapod.gpoddernet;
-
-import org.apache.http.conn.ClientConnectionManager;
-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.conn.ssl.SSLSocketFactory;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
-import org.apache.http.params.BasicHttpParams;
-
-/**
- * HTTP client for the gpodder.net service.
- */
-public class GpodnetClient extends DefaultHttpClient {
-
-    private static SchemeRegistry prepareSchemeRegistry() {
-        SchemeRegistry sr = new SchemeRegistry();
-
-        Scheme http = new Scheme("http",
-                PlainSocketFactory.getSocketFactory(), 80);
-        sr.register(http);
-        Scheme https = new Scheme("https",
-                SSLSocketFactory.getSocketFactory(), 443);
-        sr.register(https);
-
-        return sr;
-    }
-
-    @Override
-    protected ClientConnectionManager createClientConnectionManager() {
-        return new ThreadSafeClientConnManager(new BasicHttpParams(), prepareSchemeRegistry());
-    }
-
-}
diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetService.java b/src/de/danoeh/antennapod/gpoddernet/GpodnetService.java
index 6e819f570..a0c5b534c 100644
--- a/src/de/danoeh/antennapod/gpoddernet/GpodnetService.java
+++ b/src/de/danoeh/antennapod/gpoddernet/GpodnetService.java
@@ -1,9 +1,8 @@
 package de.danoeh.antennapod.gpoddernet;
 
-import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.gpoddernet.model.*;
 import de.danoeh.antennapod.preferences.GpodnetPreferences;
-import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.service.download.AntennapodHttpClient;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -11,15 +10,13 @@ import org.apache.http.HttpStatus;
 import org.apache.http.auth.AuthenticationException;
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.auth.BasicScheme;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -45,16 +42,10 @@ public class GpodnetService {
     public static final String DEFAULT_BASE_HOST = "gpodder.net";
     private final String BASE_HOST;
 
-    private static final int TIMEOUT_MILLIS = 20000;
-
-    private final GpodnetClient httpClient;
+    private final HttpClient httpClient;
 
     public GpodnetService() {
-        httpClient = new GpodnetClient();
-        final HttpParams params = httpClient.getParams();
-        params.setParameter(CoreProtocolPNames.USER_AGENT, AppConfig.USER_AGENT);
-        HttpConnectionParams.setConnectionTimeout(params, TIMEOUT_MILLIS);
-        HttpConnectionParams.setSoTimeout(params, TIMEOUT_MILLIS);
+        httpClient = AntennapodHttpClient.getHttpClient();
         BASE_HOST = GpodnetPreferences.getHostname();
     }
 
@@ -519,7 +510,7 @@ public class GpodnetService {
         new Thread() {
             @Override
             public void run() {
-                httpClient.getConnectionManager().shutdown();
+                AntennapodHttpClient.cleanup();
             }
         }.start();
     }