Merge branch 'migration' into develop

Non-GUI classes have been moved into the 'core' project in order to allow AntennaPod SP to reference it as a subproject.

Conflicts:
	app/src/main/AndroidManifest.xml
	build.gradle
	core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
	core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSSimpleChapters.java
	core/src/main/java/de/danoeh/antennapod/core/util/ChapterUtils.java
	gradle/wrapper/gradle-wrapper.properties
	pom.xml

5 files changed, 0 insertions, 280 deletions

diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java
deleted file mode 100644
index 86a2171fa..000000000
--- a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package de.danoeh.antennapod.gpoddernet.model;
-
-import org.apache.commons.lang3.Validate;
-
-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) {
-        Validate.notNull(id);
-
-        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
deleted file mode 100644
index b002035c9..000000000
--- a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package de.danoeh.antennapod.gpoddernet.model;
-
-import org.apache.commons.lang3.Validate;
-
-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) {
-        Validate.notNull(url);
-        Validate.notNull(title);
-        Validate.notNull(description);
-
-        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
deleted file mode 100644
index a4617118d..000000000
--- a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package de.danoeh.antennapod.gpoddernet.model;
-
-import org.apache.commons.lang3.Validate;
-
-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) {
-        Validate.notNull(added);
-        Validate.notNull(removed);
-
-        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
deleted file mode 100644
index 80b84095e..000000000
--- a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package de.danoeh.antennapod.gpoddernet.model;
-
-import org.apache.commons.lang3.Validate;
-
-import java.util.Comparator;
-
-public class GpodnetTag {
-
-    private String name;
-    private int usage;
-
-    public GpodnetTag(String name, int usage) {
-        Validate.notNull(name);
-
-        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/de/danoeh/antennapod/gpoddernet/model/GpodnetUploadChangesResponse.java b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetUploadChangesResponse.java
deleted file mode 100644
index fee8c7d28..000000000
--- a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetUploadChangesResponse.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package de.danoeh.antennapod.gpoddernet.model;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Object returned by {@link de.danoeh.antennapod.gpoddernet.GpodnetService} in uploadChanges method.
- */
-public class GpodnetUploadChangesResponse {
-
-    /**
-     * timestamp/ID that can be used for requesting changes since this upload.
-     */
-    public final long timestamp;
-
-    /**
-     * URLs that should be updated. The key of the map is the original URL, the value of the map
-     * is the sanitized URL.
-     */
-    public final Map<String, String> updatedUrls;
-
-    public GpodnetUploadChangesResponse(long timestamp, Map<String, String> updatedUrls) {
-        this.timestamp = timestamp;
-        this.updatedUrls = updatedUrls;
-    }
-
-    /**
-     * Creates a new GpodnetUploadChangesResponse-object from a JSON object that was
-     * returned by an uploadChanges call.
-     *
-     * @throws org.json.JSONException If the method could not parse the JSONObject.
-     */
-    public static GpodnetUploadChangesResponse fromJSONObject(String objectString) throws JSONException {
-        final JSONObject object = new JSONObject(objectString);
-        final long timestamp = object.getLong("timestamp");
-        Map<String, String> updatedUrls = new HashMap<String, String>();
-        JSONArray urls = object.getJSONArray("update_urls");
-        for (int i = 0; i < urls.length(); i++) {
-            JSONArray urlPair = urls.getJSONArray(i);
-            updatedUrls.put(urlPair.getString(0), urlPair.getString(1));
-        }
-        return new GpodnetUploadChangesResponse(timestamp, updatedUrls);
-    }
-
-    @Override
-    public String toString() {
-        return "GpodnetUploadChangesResponse{" +
-                "timestamp=" + timestamp +
-                ", updatedUrls=" + updatedUrls +
-                '}';
-    }
-}