diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetClient.java b/src/de/danoeh/antennapod/gpoddernet/GpodnetClient.java
new file mode 100644
index 000000000..845a23823
--- /dev/null
+++ b/src/de/danoeh/antennapod/gpoddernet/GpodnetClient.java
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 000000000..dd45d178f
--- /dev/null
+++ b/src/de/danoeh/antennapod/gpoddernet/GpodnetService.java
@@ -0,0 +1,669 @@
+package de.danoeh.antennapod.gpoddernet;
+
+import de.danoeh.antennapod.gpoddernet.model.GpodnetDevice;
+import de.danoeh.antennapod.gpoddernet.model.GpodnetPodcast;
+import de.danoeh.antennapod.gpoddernet.model.GpodnetSubscriptionChange;
+import de.danoeh.antennapod.gpoddernet.model.GpodnetTag;
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+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.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.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Communicates with the gpodder.net service.
+ */
+public class GpodnetService {
+
+    private static final String BASE_SCHEME = "https";
+    private static final String BASE_HOST = "gpodder.net";
+
+    private GpodnetClient httpClient;
+
+    public GpodnetService() {
+        httpClient = new GpodnetClient();
+    }
+
+    /**
+     * Returns the [count] most used tags.
+     */
+    public List<GpodnetTag> getTopTags(int count)
+            throws GpodnetServiceException {
+        URI uri;
+        try {
+            uri = new URI(BASE_SCHEME, BASE_HOST, String.format(
+                    "/api/2/tags/%d.json", count), null);
+        } catch (URISyntaxException e1) {
+            e1.printStackTrace();
+            throw new IllegalStateException(e1);
+        }
+
+        HttpGet request = new HttpGet(uri);
+        String response = executeRequest(request);
+        try {
+            JSONArray jsonTagList = new JSONArray(response);
+            List<GpodnetTag> tagList = new ArrayList<GpodnetTag>(
+                    jsonTagList.length());
+            for (int i = 0; i < jsonTagList.length(); i++) {
+                JSONObject jObj = jsonTagList.getJSONObject(i);
+                String name = jObj.getString("tag");
+                int usage = jObj.getInt("usage");
+                tagList.add(new GpodnetTag(name, usage));
+            }
+            return tagList;
+        } catch (JSONException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+        }
+    }
+
+    /**
+     * Returns the [count] most subscribed podcasts for the given tag.
+     *
+     * @throws IllegalArgumentException if tag is null
+     */
+    public List<GpodnetPodcast> getPodcastsForTag(GpodnetTag tag, int count)
+            throws GpodnetServiceException {
+        if (tag == null) {
+            throw new IllegalArgumentException(
+                    "Tag and title of tag must not be null");
+        }
+        try {
+            URI uri = new URI(BASE_SCHEME, BASE_HOST, String.format(
+                    "/api/2/tag/%s/%d.json", tag.getName(), count), null);
+            HttpGet request = new HttpGet(uri);
+            String response = executeRequest(request);
+
+            JSONArray jsonArray = new JSONArray(response);
+            return readPodcastListFromJSONArray(jsonArray);
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+
+        }
+    }
+
+    /**
+     * Returns the toplist of podcast.
+     *
+     * @param count of elements that should be returned. Must be in range 1..100.
+     * @throws IllegalArgumentException if count is out of range.
+     */
+    public List<GpodnetPodcast> getPodcastToplist(int count)
+            throws GpodnetServiceException {
+        if (count < 1 || count > 100) {
+            throw new IllegalArgumentException("Count must be in range 1..100");
+        }
+        try {
+            URI uri = new URI(BASE_SCHEME, BASE_HOST, String.format(
+                    "/toplist/%d.json", count), null);
+            HttpGet request = new HttpGet(uri);
+            String response = executeRequest(request);
+
+            JSONArray jsonArray = new JSONArray(response);
+            return readPodcastListFromJSONArray(jsonArray);
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            throw new IllegalStateException(e);
+
+        }
+    }
+
+    /**
+     * Returns a list of suggested podcasts for the user that is currently
+     * logged in.
+     * <p/>
+     * This method requires authentication.
+     *
+     * @param count The
+     *              number of elements that should be returned. Must be in range
+     *              1..100.
+     * @throws IllegalArgumentException              if count is out of range.
+     * @throws GpodnetServiceAuthenticationException If there is an authentication error.
+     */
+    public List<GpodnetPodcast> getSuggestions(int count) throws GpodnetServiceException {
+        if (count < 1 || count > 100) {
+            throw new IllegalArgumentException("Count must be in range 1..100");
+        }
+        try {
+            URI uri = new URI(BASE_SCHEME, BASE_HOST, String.format(
+                    "/suggestions/%d.json", count), null);
+            HttpGet request = new HttpGet(uri);
+            String response = executeRequest(request);
+
+            JSONArray jsonArray = new JSONArray(response);
+            return readPodcastListFromJSONArray(jsonArray);
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            throw new IllegalStateException(e);
+        } catch (JSONException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+        }
+    }
+
+    /**
+     * Searches the podcast directory for a given string.
+     *
+     * @param query          The search query
+     * @param scaledLogoSize The size of the logos that are returned by the search query.
+     *                       Must be in range 1..256. If the value is out of range, the
+     *                       default value defined by the gpodder.net API will be used.
+     */
+    public List<GpodnetPodcast> searchPodcasts(String query, int scaledLogoSize)
+            throws GpodnetServiceException {
+        String parameters = (scaledLogoSize > 0 && scaledLogoSize <= 256) ? String
+                .format("q=%s&scale_logo=%d", query, scaledLogoSize) : String
+                .format("q=%s", query);
+        try {
+            URI uri = new URI(BASE_SCHEME, null, BASE_HOST, -1, "/search.json",
+                    parameters, null);
+            System.out.println(uri.toASCIIString());
+            HttpGet request = new HttpGet(uri);
+            String response = executeRequest(request);
+
+            JSONArray jsonArray = new JSONArray(response);
+            return readPodcastListFromJSONArray(jsonArray);
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            throw new IllegalStateException(e);
+
+        }
+    }
+
+    /**
+     * Returns all devices of a given user.
+     * <p/>
+     * This method requires authentication.
+     *
+     * @param username The username. Must be the same user as the one which is
+     *                 currently logged in.
+     * @throws IllegalArgumentException              If username is null.
+     * @throws GpodnetServiceAuthenticationException If there is an authentication error.
+     */
+    public List<GpodnetDevice> getDevices(String username)
+            throws GpodnetServiceException {
+        if (username == null) {
+            throw new IllegalArgumentException("Username must not be null");
+        }
+        try {
+            URI uri = new URI(BASE_SCHEME, BASE_HOST, String.format(
+                    "/api/2/devices/%s.json", username), null);
+            HttpGet request = new HttpGet(uri);
+            String response = executeRequest(request);
+            JSONArray devicesArray = new JSONArray(response);
+            List<GpodnetDevice> result = readDeviceListFromJSONArray(devicesArray);
+
+            return result;
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            throw new IllegalStateException(e);
+        } catch (JSONException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+        }
+    }
+
+    /**
+     * Configures the device of a given user.
+     * <p/>
+     * This method requires authentication.
+     *
+     * @param username The username. Must be the same user as the one which is
+     *                 currently logged in.
+     * @param deviceId The ID of the device that should be configured.
+     * @throws IllegalArgumentException              If username or deviceId is null.
+     * @throws GpodnetServiceAuthenticationException If there is an authentication error.
+     */
+    public void configureDevice(String username, String deviceId,
+                                String caption, GpodnetDevice.DeviceType type)
+            throws GpodnetServiceException {
+        if (username == null || deviceId == null) {
+            throw new IllegalArgumentException(
+                    "Username and device ID must not be null");
+        }
+        try {
+            URI uri = new URI(BASE_SCHEME, BASE_HOST, String.format(
+                    "/api/2/devices/%s/%s.json", username, deviceId), null);
+            HttpPost request = new HttpPost(uri);
+            if (caption != null || type != null) {
+                JSONObject jsonContent = new JSONObject();
+                if (caption != null) {
+                    jsonContent.put("caption", caption);
+                }
+                if (type != null) {
+                    jsonContent.put("type", type.toString());
+                }
+                StringEntity strEntity = new StringEntity(
+                        jsonContent.toString(), "UTF-8");
+                strEntity.setContentType("application/json");
+                request.setEntity(strEntity);
+            }
+            executeRequest(request);
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            throw new IllegalArgumentException(e);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            throw new IllegalStateException(e);
+        } catch (JSONException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+        }
+    }
+
+    /**
+     * Returns the subscriptions of a specific device.
+     * <p/>
+     * This method requires authentication.
+     *
+     * @param username The username. Must be the same user as the one which is
+     *                 currently logged in.
+     * @param deviceId The ID of the device whose subscriptions should be returned.
+     * @return A list of subscriptions in OPML format.
+     * @throws IllegalArgumentException              If username or deviceId is null.
+     * @throws GpodnetServiceAuthenticationException If there is an authentication error.
+     */
+    public String getSubscriptionsOfDevice(String username, String deviceId)
+            throws GpodnetServiceException {
+        if (username == null || deviceId == null) {
+            throw new IllegalArgumentException(
+                    "Username and device ID must not be null");
+        }
+        try {
+            URI uri = new URI(BASE_SCHEME, BASE_HOST, String.format(
+                    "/subscriptions/%s/%s.opml", username, deviceId), null);
+            HttpGet request = new HttpGet(uri);
+            String response = executeRequest(request);
+            return response;
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    /**
+     * Returns all subscriptions of a specific user.
+     * <p/>
+     * This method requires authentication.
+     *
+     * @param username The username. Must be the same user as the one which is
+     *                 currently logged in.
+     * @return A list of subscriptions in OPML format.
+     * @throws IllegalArgumentException              If username is null.
+     * @throws GpodnetServiceAuthenticationException If there is an authentication error.
+     */
+    public String getSubscriptionsOfUser(String username)
+            throws GpodnetServiceException {
+        if (username == null) {
+            throw new IllegalArgumentException("Username must not be null");
+        }
+        try {
+            URI uri = new URI(BASE_SCHEME, BASE_HOST, String.format(
+                    "/subscriptions/%s.opml", username), null);
+            HttpGet request = new HttpGet(uri);
+            String response = executeRequest(request);
+            return response;
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    /**
+     * Uploads the subscriptions of a specific device.
+     * <p/>
+     * This method requires authentication.
+     *
+     * @param username      The username. Must be the same user as the one which is
+     *                      currently logged in.
+     * @param deviceId      The ID of the device whose subscriptions should be updated.
+     * @param subscriptions A list of feed URLs containing all subscriptions of the
+     *                      device.
+     * @throws IllegalArgumentException              If username, deviceId or subscriptions is null.
+     * @throws GpodnetServiceAuthenticationException If there is an authentication error.
+     */
+    public void uploadSubscriptions(String username, String deviceId,
+                                    List<String> subscriptions) throws GpodnetServiceException {
+        if (username == null || deviceId == null || subscriptions == null) {
+            throw new IllegalArgumentException(
+                    "Username, device ID and subscriptions must not be null");
+        }
+        try {
+            URI uri = new URI(BASE_SCHEME, BASE_HOST, String.format(
+                    "/subscriptions/%s/%s.txt", username, deviceId), null);
+            HttpPut request = new HttpPut(uri);
+            StringBuilder builder = new StringBuilder();
+            for (String s : subscriptions) {
+                builder.append(s);
+                builder.append("\n");
+            }
+            StringEntity entity = new StringEntity(builder.toString(), "UTF-8");
+            request.setEntity(entity);
+
+            executeRequest(request);
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            throw new IllegalStateException(e);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            throw new IllegalStateException(e);
+        }
+    }
+
+    /**
+     * Returns all subscription changes of a specific device.
+     * <p/>
+     * This method requires authentication.
+     *
+     * @param username  The username. Must be the same user as the one which is
+     *                  currently logged in.
+     * @param deviceId  The ID of the device whose subscription changes should be
+     *                  downloaded.
+     * @param timestamp A timestamp that can be used to receive all changes since a
+     *                  specific point in time.
+     * @throws IllegalArgumentException              If username or deviceId is null.
+     * @throws GpodnetServiceAuthenticationException If there is an authentication error.
+     */
+    public GpodnetSubscriptionChange getSubscriptionChanges(String username,
+                                                            String deviceId, long timestamp) throws GpodnetServiceException {
+        if (username == null || deviceId == null) {
+            throw new IllegalArgumentException(
+                    "Username and device ID must not be null");
+        }
+        String params = String.format("since=%d", timestamp);
+        String path = String.format("/api/2/subscriptions/%s/%s.json",
+                username, deviceId);
+        try {
+            URI uri = new URI(BASE_SCHEME, null, BASE_HOST, -1, path, params,
+                    null);
+            HttpGet request = new HttpGet(uri);
+
+            String response = executeRequest(request);
+            JSONObject changes = new JSONObject(response);
+            return readSubscriptionChangesFromJSONObject(changes);
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            throw new IllegalStateException(e);
+        } catch (JSONException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+        }
+
+    }
+
+    /**
+     * Logs in a specific user. This method must be called if any of the methods
+     * that require authentication is used.
+     *
+     * @throws IllegalArgumentException If username or password is null.
+     */
+    public void authenticate(String username, String password)
+            throws GpodnetServiceException {
+        if (username == null || password == null) {
+            throw new IllegalArgumentException(
+                    "Username and password must not be null");
+        }
+        URI uri;
+        try {
+            uri = new URI(BASE_SCHEME, BASE_HOST, String.format(
+                    "/api/2/auth/%s/login.json", username), null);
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException();
+        }
+        HttpPost request = new HttpPost(uri);
+        executeRequestWithAuthentication(request, username, password);
+    }
+
+    /**
+     * Shuts down the GpodnetService's HTTP client.
+     */
+    public void shutdown() {
+        httpClient.getConnectionManager().shutdown();
+    }
+
+    private String executeRequest(HttpRequestBase request)
+            throws GpodnetServiceException {
+        if (request == null) {
+            throw new IllegalArgumentException("request must not be null");
+        }
+        String responseString = null;
+        HttpResponse response = null;
+        try {
+            response = httpClient.execute(request);
+            checkStatusCode(response);
+            responseString = getStringFromEntity(response.getEntity());
+        } catch (ClientProtocolException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+        } finally {
+            if (response != null) {
+                try {
+                    response.getEntity().consumeContent();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    throw new GpodnetServiceException(e);
+                }
+            }
+
+        }
+        return responseString;
+    }
+
+    private String executeRequestWithAuthentication(HttpRequestBase request,
+                                                    String username, String password) throws GpodnetServiceException {
+        if (request == null || username == null || password == null) {
+            throw new IllegalArgumentException(
+                    "request and credentials must not be null");
+        }
+        String result = null;
+        HttpResponse response = null;
+        try {
+            Header auth = new BasicScheme().authenticate(
+                    new UsernamePasswordCredentials(username, password),
+                    request);
+            request.addHeader(auth);
+            response = httpClient.execute(request);
+            checkStatusCode(response);
+            result = getStringFromEntity(response.getEntity());
+        } catch (ClientProtocolException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+        } catch (AuthenticationException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+        } finally {
+            if (response != null) {
+                try {
+                    response.getEntity().consumeContent();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    throw new GpodnetServiceException(e);
+                }
+            }
+        }
+        return result;
+    }
+
+    private String getStringFromEntity(HttpEntity entity)
+            throws GpodnetServiceException {
+        if (entity == null) {
+            throw new IllegalArgumentException("entity must not be null");
+        }
+        ByteArrayOutputStream outputStream;
+        int contentLength = (int) entity.getContentLength();
+        if (contentLength > 0) {
+            outputStream = new ByteArrayOutputStream(contentLength);
+        } else {
+            outputStream = new ByteArrayOutputStream();
+        }
+        try {
+            byte[] buffer = new byte[8 * 1024];
+            InputStream in = entity.getContent();
+            int count;
+            while ((count = in.read(buffer)) > 0) {
+                outputStream.write(buffer, 0, count);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new GpodnetServiceException(e);
+        }
+        // System.out.println(outputStream.toString());
+        return outputStream.toString();
+    }
+
+    private void checkStatusCode(HttpResponse response)
+            throws GpodnetServiceException {
+        if (response == null) {
+            throw new IllegalArgumentException("response must not be null");
+        }
+        int responseCode = response.getStatusLine().getStatusCode();
+        if (responseCode != HttpStatus.SC_OK) {
+            if (responseCode == HttpStatus.SC_UNAUTHORIZED) {
+                throw new GpodnetServiceAuthenticationException();
+            } else {
+                throw new GpodnetServiceBadStatusCodeException(
+                        "Bad response code: " + responseCode, responseCode);
+            }
+        }
+    }
+
+    private List<GpodnetPodcast> readPodcastListFromJSONArray(JSONArray array)
+            throws JSONException {
+        if (array == null) {
+            throw new IllegalArgumentException("array must not be null");
+        }
+        List<GpodnetPodcast> result = new ArrayList<GpodnetPodcast>(
+                array.length());
+        for (int i = 0; i < array.length(); i++) {
+            result.add(readPodcastFromJSONObject(array.getJSONObject(i)));
+        }
+        return result;
+
+    }
+
+    private GpodnetPodcast readPodcastFromJSONObject(JSONObject object)
+            throws JSONException {
+        String url = object.getString("url");
+
+        String title;
+        Object titleObj = object.opt("title");
+        if (titleObj != null && titleObj instanceof String) {
+            title = (String) titleObj;
+        } else {
+            title = url;
+        }
+
+        String description;
+        Object descriptionObj = object.opt("description");
+        if (descriptionObj != null && descriptionObj instanceof String) {
+            description = (String) descriptionObj;
+        } else {
+            description = "";
+        }
+
+        int subscribers = object.getInt("subscribers");
+
+        Object logoUrlObj = object.opt("logo_url");
+        String logoUrl = (logoUrlObj instanceof String) ? (String) logoUrlObj
+                : null;
+        if (logoUrl == null) {
+            Object scaledLogoUrl = object.opt("scaled_logo_url");
+            if (scaledLogoUrl != null && scaledLogoUrl instanceof String) {
+                logoUrl = (String) scaledLogoUrl;
+            }
+        }
+
+        String website = null;
+        Object websiteObj = object.opt("website");
+        if (websiteObj != null && websiteObj instanceof String) {
+            website = (String) websiteObj;
+        }
+        String mygpoLink = object.getString("mygpo_link");
+        return new GpodnetPodcast(url, title, description, subscribers,
+                logoUrl, website, mygpoLink);
+    }
+
+    private List<GpodnetDevice> readDeviceListFromJSONArray(JSONArray array)
+            throws JSONException {
+        if (array == null) {
+            throw new IllegalArgumentException("array must not be null");
+        }
+        List<GpodnetDevice> result = new ArrayList<GpodnetDevice>(
+                array.length());
+        for (int i = 0; i < array.length(); i++) {
+            result.add(readDeviceFromJSONObject(array.getJSONObject(i)));
+        }
+        return result;
+    }
+
+    private GpodnetDevice readDeviceFromJSONObject(JSONObject object)
+            throws JSONException {
+        String id = object.getString("id");
+        String caption = object.getString("caption");
+        String type = object.getString("type");
+        int subscriptions = object.getInt("subscriptions");
+        return new GpodnetDevice(id, caption, type, subscriptions);
+    }
+
+    private GpodnetSubscriptionChange readSubscriptionChangesFromJSONObject(
+            JSONObject object) throws JSONException {
+        if (object == null) {
+            throw new IllegalArgumentException("object must not be null");
+        }
+        List<String> added = new LinkedList<String>();
+        JSONArray jsonAdded = object.getJSONArray("add");
+        for (int i = 0; i < jsonAdded.length(); i++) {
+            added.add(jsonAdded.getString(i));
+        }
+
+        List<String> removed = new LinkedList<String>();
+        JSONArray jsonRemoved = object.getJSONArray("remove");
+        for (int i = 0; i < jsonRemoved.length(); i++) {
+            removed.add(jsonRemoved.getString(i));
+        }
+
+        long timestamp = object.getLong("timestamp");
+        return new GpodnetSubscriptionChange(added, removed, timestamp);
+    }
+}
diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceAuthenticationException.java b/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceAuthenticationException.java
new file mode 100644
index 000000000..3b0140826
--- /dev/null
+++ b/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceAuthenticationException.java
@@ -0,0 +1,21 @@
+package de.danoeh.antennapod.gpoddernet;
+
+public class GpodnetServiceAuthenticationException extends GpodnetServiceException {
+
+    public GpodnetServiceAuthenticationException() {
+        super();
+    }
+
+    public GpodnetServiceAuthenticationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public GpodnetServiceAuthenticationException(String message) {
+        super(message);
+    }
+
+    public GpodnetServiceAuthenticationException(Throwable cause) {
+        super(cause);
+    }
+
+}
diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceBadStatusCodeException.java b/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceBadStatusCodeException.java
new file mode 100644
index 000000000..a32e9357b
--- /dev/null
+++ b/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceBadStatusCodeException.java
@@ -0,0 +1,12 @@
+package de.danoeh.antennapod.gpoddernet;
+
+public class GpodnetServiceBadStatusCodeException extends GpodnetServiceException {
+    int statusCode;
+
+    public GpodnetServiceBadStatusCodeException(String message, int statusCode) {
+        super(message);
+        this.statusCode = statusCode;
+    }
+
+
+}
diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceException.java b/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceException.java
new file mode 100644
index 000000000..bdb394454
--- /dev/null
+++ b/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceException.java
@@ -0,0 +1,19 @@
+package de.danoeh.antennapod.gpoddernet;
+
+public class GpodnetServiceException extends Exception {
+
+    public GpodnetServiceException() {
+    }
+
+    public GpodnetServiceException(String message) {
+        super(message);
+    }
+
+    public GpodnetServiceException(Throwable cause) {
+        super(cause);
+    }
+
+    public GpodnetServiceException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java
new file mode 100644
index 000000000..ae7199fcc
--- /dev/null
+++ b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java
@@ -0,0 +1,72 @@
+package de.danoeh.antennapod.gpoddernet.model;
+
+public class GpodnetDevice {
+
+    private String id;
+    private String caption;
+    private DeviceType type;
+    private int subscriptions;
+
+    public GpodnetDevice(String id, String caption, String type,
+                         int subscriptions) {
+        if (id == null) {
+            throw new IllegalArgumentException("ID must not be null");
+        }
+
+        this.id = id;
+        this.caption = caption;
+        this.type = DeviceType.fromString(type);
+        this.subscriptions = subscriptions;
+    }
+
+    @Override
+    public String toString() {
+        return "GpodnetDevice [id=" + id + ", caption=" + caption + ", type="
+                + type + ", subscriptions=" + subscriptions + "]";
+    }
+
+    public static enum DeviceType {
+        DESKTOP, LAPTOP, MOBILE, SERVER, OTHER;
+
+        static DeviceType fromString(String s) {
+            if (s == null) {
+                return OTHER;
+            }
+
+            if (s.equals("desktop")) {
+                return DESKTOP;
+            } else if (s.equals("laptop")) {
+                return LAPTOP;
+            } else if (s.equals("mobile")) {
+                return MOBILE;
+            } else if (s.equals("server")) {
+                return SERVER;
+            } else {
+                return OTHER;
+            }
+        }
+
+        @Override
+        public String toString() {
+            return super.toString().toLowerCase();
+        }
+
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getCaption() {
+        return caption;
+    }
+
+    public DeviceType getType() {
+        return type;
+    }
+
+    public int getSubscriptions() {
+        return subscriptions;
+    }
+
+}
diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java
new file mode 100644
index 000000000..aa01b66e2
--- /dev/null
+++ b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java
@@ -0,0 +1,64 @@
+package de.danoeh.antennapod.gpoddernet.model;
+
+public class GpodnetPodcast {
+    private String url;
+    private String title;
+    private String description;
+    private int subscribers;
+    private String logoUrl;
+    private String website;
+    private String mygpoLink;
+
+    public GpodnetPodcast(String url, String title, String description,
+                          int subscribers, String logoUrl, String website, String mygpoLink) {
+        if (url == null || title == null || description == null) {
+            throw new IllegalArgumentException(
+                    "URL, title and description must not be null");
+        }
+
+        this.url = url;
+        this.title = title;
+        this.description = description;
+        this.subscribers = subscribers;
+        this.logoUrl = logoUrl;
+        this.website = website;
+        this.mygpoLink = mygpoLink;
+    }
+
+    @Override
+    public String toString() {
+        return "GpodnetPodcast [url=" + url + ", title=" + title
+                + ", description=" + description + ", subscribers="
+                + subscribers + ", logoUrl=" + logoUrl + ", website=" + website
+                + ", mygpoLink=" + mygpoLink + "]";
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public int getSubscribers() {
+        return subscribers;
+    }
+
+    public String getLogoUrl() {
+        return logoUrl;
+    }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public String getMygpoLink() {
+        return mygpoLink;
+    }
+
+}
diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java
new file mode 100644
index 000000000..dccb53e5d
--- /dev/null
+++ b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java
@@ -0,0 +1,40 @@
+package de.danoeh.antennapod.gpoddernet.model;
+
+import java.util.List;
+
+public class GpodnetSubscriptionChange {
+    private List<String> added;
+    private List<String> removed;
+    private long timestamp;
+
+    public GpodnetSubscriptionChange(List<String> added, List<String> removed,
+                                     long timestamp) {
+        if (added == null || removed == null) {
+            throw new IllegalArgumentException(
+                    "added and remove must not be null");
+        }
+        this.added = added;
+        this.removed = removed;
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public String toString() {
+        return "GpodnetSubscriptionChange [added=" + added.toString()
+                + ", removed=" + removed.toString() + ", timestamp="
+                + timestamp + "]";
+    }
+
+    public List<String> getAdded() {
+        return added;
+    }
+
+    public List<String> getRemoved() {
+        return removed;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+}
diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java
new file mode 100644
index 000000000..e8a36a554
--- /dev/null
+++ b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java
@@ -0,0 +1,46 @@
+package de.danoeh.antennapod.gpoddernet.model;
+
+import java.util.Comparator;
+
+public class GpodnetTag {
+
+    private String name;
+    private int usage;
+
+    public GpodnetTag(String name, int usage) {
+        if (name == null) {
+            throw new IllegalArgumentException("Name must not be null");
+        }
+
+        this.name = name;
+        this.usage = usage;
+    }
+
+    public GpodnetTag(String name) {
+        super();
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "GpodnetTag [name=" + name + ", usage=" + usage + "]";
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getUsage() {
+        return usage;
+    }
+
+    public static class UsageComparator implements Comparator<GpodnetTag> {
+
+        @Override
+        public int compare(GpodnetTag o1, GpodnetTag o2) {
+            return o1.usage - o2.usage;
+        }
+
+    }
+
+}
diff --git a/src/instrumentationTest/de/test/antennapod/gpodnet/GPodnetServiceTest.java b/src/instrumentationTest/de/test/antennapod/gpodnet/GPodnetServiceTest.java
new file mode 100644
index 000000000..bcf0d5d43
--- /dev/null
+++ b/src/instrumentationTest/de/test/antennapod/gpodnet/GPodnetServiceTest.java
@@ -0,0 +1,102 @@
+package instrumentationTest.de.test.antennapod.gpodnet;
+
+import android.test.AndroidTestCase;
+import de.danoeh.antennapod.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
+import de.danoeh.antennapod.gpoddernet.model.GpodnetDevice;
+import de.danoeh.antennapod.gpoddernet.model.GpodnetTag;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Test class for GpodnetService
+ */
+public class GPodnetServiceTest extends AndroidTestCase {
+
+    private GpodnetService service;
+
+    private static final String USER = "";
+    private static final String PW = "";
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        service = new GpodnetService();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    private void authenticate() throws GpodnetServiceException {
+        service.authenticate(USER, PW);
+    }
+
+    public void testUploadSubscription() throws GpodnetServiceException {
+        authenticate();
+        ArrayList<String> l = new ArrayList<String>();
+        l.add("http://bitsundso.de/feed");
+        service.uploadSubscriptions(USER, "radio", l);
+    }
+
+    public void testUploadSubscription2() throws GpodnetServiceException {
+        authenticate();
+        ArrayList<String> l = new ArrayList<String>();
+        l.add("http://bitsundso.de/feed");
+        l.add("http://gamesundso.de/feed");
+        service.uploadSubscriptions(USER, "radio", l);
+    }
+
+    public void testGetSubscriptionChanges() throws GpodnetServiceException {
+        authenticate();
+        service.getSubscriptionChanges(USER, "radio", 1362322610L);
+    }
+
+    public void testGetSubscriptionsOfUser()
+            throws GpodnetServiceException {
+        authenticate();
+        service.getSubscriptionsOfUser(USER);
+    }
+
+    public void testGetSubscriptionsOfDevice()
+            throws GpodnetServiceException {
+        authenticate();
+        service.getSubscriptionsOfDevice(USER, "radio");
+    }
+
+    public void testConfigureDevices() throws GpodnetServiceException {
+        authenticate();
+        service.configureDevice(USER, "foo", "This is an updated caption",
+                GpodnetDevice.DeviceType.LAPTOP);
+    }
+
+    public void testGetDevices() throws GpodnetServiceException {
+        authenticate();
+        service.getDevices(USER);
+    }
+
+    public void testGetSuggestions() throws GpodnetServiceException {
+        authenticate();
+        service.getSuggestions(10);
+    }
+
+    public void testTags() throws GpodnetServiceException {
+        service.getTopTags(20);
+    }
+
+    public void testPodcastForTags() throws GpodnetServiceException {
+        List<GpodnetTag> tags = service.getTopTags(20);
+        service.getPodcastsForTag(tags.get(1),
+                10);
+    }
+
+    public void testSearch() throws GpodnetServiceException {
+        service.searchPodcasts("linux", 64);
+    }
+
+    public void testToplist() throws GpodnetServiceException {
+        service.getPodcastToplist(10);
+    }
+}