Merge branch 'release-0975'0.9.7.5

1 files changed, 5 insertions, 6 deletions

diff --git a/src/de/danoeh/antennapod/util/URLChecker.java b/src/de/danoeh/antennapod/util/URLChecker.java
index 6d9b8ff03..13668d4a9 100644
--- a/src/de/danoeh/antennapod/util/URLChecker.java
+++ b/src/de/danoeh/antennapod/util/URLChecker.java
@@ -19,13 +19,12 @@ public final class URLChecker {
      * */
     public static String prepareURL(String url) {
         StringBuilder builder = new StringBuilder();
-        url = url.trim();
-        if (!url.startsWith("http")) {
+        if (url.startsWith("feed://")) {
+            if (AppConfig.DEBUG) Log.d(TAG, "Replacing feed:// with http://");
+            url = url.replace("feed://", "http://");
+        } else if (!(url.startsWith("http://") || url.startsWith("https://"))) {
+            if (AppConfig.DEBUG) Log.d(TAG, "Adding http:// at the beginning of the URL");
             builder.append("http://");
-            if (AppConfig.DEBUG) Log.d(TAG, "Missing http; appending");
-        } else if (url.startsWith("https")) {
-        	if (AppConfig.DEBUG) Log.d(TAG, "Replacing https with http");
-        	url = url.replaceFirst("https", "http");
         }
         builder.append(url);