Merge branch 'master' into develop

5 files changed, 93 insertions, 55 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
index 7c8fe9452..7b7879409 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
@@ -109,6 +109,23 @@ public class DownloadServiceNotification {
         return sb.toString();
     }
 
+    private String createFailedDownloadNotificationContent(List<DownloadStatus> statuses) {
+        StringBuilder sb = new StringBuilder();
+
+        for (int i = 0; i < statuses.size(); i++) {
+            if (statuses.get(i).isSuccessful()) {
+                continue;
+            }
+            sb.append("• ").append(statuses.get(i).getTitle());
+            sb.append(": ").append(statuses.get(i).getReason().getErrorString(context));
+            if (i != statuses.size() - 1) {
+                sb.append("\n");
+            }
+        }
+
+        return sb.toString();
+    }
+
     /**
      * Creates a notification at the end of the service lifecycle to notify the
      * user about the number of completed downloads. A report will only be
@@ -156,11 +173,7 @@ public class DownloadServiceNotification {
                 iconId = R.drawable.ic_notification_sync_error;
                 intent = ClientConfig.downloadServiceCallbacks.getReportNotificationContentIntent(context);
                 id = R.id.notification_download_report;
-                content = context.getResources()
-                        .getQuantityString(R.plurals.download_report_content,
-                                successfulDownloads,
-                                successfulDownloads,
-                                failedDownloads);
+                content = createFailedDownloadNotificationContent(reportQueue);
             }
 
             NotificationCompat.Builder builder = new NotificationCompat.Builder(context, channelId);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
index b553a9d1f..2d955859f 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
@@ -19,6 +19,8 @@ import java.net.URI;
 import java.net.UnknownHostException;
 import java.util.Collections;
 import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import de.danoeh.antennapod.core.R;
 import de.danoeh.antennapod.core.feed.FeedMedia;
@@ -37,6 +39,7 @@ public class HttpDownloader extends Downloader {
     private static final String TAG = "HttpDownloader";
 
     private static final int BUFFER_SIZE = 8 * 1024;
+    private static final String REGEX_PATTERN_IP_ADDRESS = "([0-9]{1,3}[\\.]){3}[0-9]{1,3}";
 
     public HttpDownloader(@NonNull DownloadRequest request) {
         super(request);
@@ -134,6 +137,9 @@ public class HttpDownloader extends Downloader {
                 } else if (response.code() == HttpURLConnection.HTTP_FORBIDDEN) {
                     error = DownloadError.ERROR_FORBIDDEN;
                     details = String.valueOf(response.code());
+                } else if (response.code() == HttpURLConnection.HTTP_NOT_FOUND) {
+                    error = DownloadError.ERROR_NOT_FOUND;
+                    details = String.valueOf(response.code());
                 } else {
                     error = DownloadError.ERROR_HTTP_DATA_ERROR;
                     details = String.valueOf(response.code());
@@ -250,6 +256,22 @@ public class HttpDownloader extends Downloader {
             onFail(DownloadError.ERROR_UNKNOWN_HOST, e.getMessage());
         } catch (IOException e) {
             e.printStackTrace();
+            String message = e.getMessage();
+            if (message != null) {
+                // Try to parse message for a more detailed error message
+                Pattern pattern = Pattern.compile(REGEX_PATTERN_IP_ADDRESS);
+                Matcher matcher = pattern.matcher(message);
+                if (matcher.find()) {
+                    String ip = matcher.group();
+                    if (ip.startsWith("127.") || ip.startsWith("0.")) {
+                        onFail(DownloadError.ERROR_IO_BLOCKED, e.getMessage());
+                        return;
+                    }
+                } else if (message.contains("Trust anchor for certification path not found")) {
+                    onFail(DownloadError.ERROR_CERTIFICATE, e.getMessage());
+                    return;
+                }
+            }
             onFail(DownloadError.ERROR_IO_ERROR, e.getMessage());
         } catch (NullPointerException e) {
             // might be thrown by connection.getInputStream()
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/FeedParserTask.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/FeedParserTask.java
index 18c5fce27..d07018f13 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/FeedParserTask.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/FeedParserTask.java
@@ -58,6 +58,9 @@ public class FeedParserTask implements Callable<FeedHandlerResult> {
             e.printStackTrace();
             successful = false;
             reason = DownloadError.ERROR_UNSUPPORTED_TYPE;
+            if ("html".equalsIgnoreCase(e.getRootElement())) {
+                reason = DownloadError.ERROR_UNSUPPORTED_TYPE_HTML;
+            }
             reasonDetailed = e.getMessage();
         } catch (InvalidFeedException e) {
             e.printStackTrace();
diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/UnsupportedFeedtypeException.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/UnsupportedFeedtypeException.java
index 11588967a..c9f9f19c8 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/UnsupportedFeedtypeException.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/UnsupportedFeedtypeException.java
@@ -36,9 +36,6 @@ public class UnsupportedFeedtypeException extends Exception {
         if (message != null) {
             return message;
         } else if (type == TypeGetter.Type.INVALID) {
-            if ("html".equals(rootElement)) {
-                return "The server returned a website, not a podcast feed";
-            }
             return "Invalid type";
         } else {
             return "Type " + type + " not supported";
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/DownloadError.java b/core/src/main/java/de/danoeh/antennapod/core/util/DownloadError.java
index b5288b7c7..9c4a61cd8 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/DownloadError.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/DownloadError.java
@@ -6,51 +6,54 @@ import de.danoeh.antennapod.core.R;
 
 /** Utility class for Download Errors. */
 public enum DownloadError {
-	SUCCESS(0, R.string.download_successful),
-	ERROR_PARSER_EXCEPTION(1, R.string.download_error_parser_exception),
-	ERROR_UNSUPPORTED_TYPE(2, R.string.download_error_unsupported_type),
-	ERROR_CONNECTION_ERROR(3, R.string.download_error_connection_error),
-	ERROR_MALFORMED_URL(4, R.string.download_error_error_unknown),
-	ERROR_IO_ERROR(5, R.string.download_error_io_error),
-	ERROR_FILE_EXISTS(6, R.string.download_error_error_unknown),
-	ERROR_DOWNLOAD_CANCELLED(7, R.string.download_error_error_unknown),
-	ERROR_DEVICE_NOT_FOUND(8, R.string.download_error_device_not_found),
-	ERROR_HTTP_DATA_ERROR(9, R.string.download_error_http_data_error),
-	ERROR_NOT_ENOUGH_SPACE(10, R.string.download_error_insufficient_space),
-	ERROR_UNKNOWN_HOST(11, R.string.download_error_unknown_host),
-	ERROR_REQUEST_ERROR(12, R.string.download_error_request_error),
-	ERROR_DB_ACCESS_ERROR(13, R.string.download_error_db_access),
-	ERROR_UNAUTHORIZED(14, R.string.download_error_unauthorized),
-	ERROR_FILE_TYPE(15, R.string.download_error_file_type_type),
-	ERROR_FORBIDDEN(16, R.string.download_error_forbidden),
-	ERROR_IO_WRONG_SIZE(17, R.string.download_wrong_size);
-
-	private final int code;
-	private final int resId;
-
-	DownloadError(int code, int resId) {
-		this.code = code;
-		this.resId = resId;
-	}
-
-	/** Return DownloadError from its associated code. */
-	public static DownloadError fromCode(int code) {
-		for (DownloadError reason : values()) {
-			if (reason.getCode() == code) {
-				return reason;
-			}
-		}
-		throw new IllegalArgumentException("unknown code: " + code);
-	}
-
-	/** Get machine-readable code. */
-	public int getCode() {
-		return code;
-	}
-
-	/** Get a human-readable string. */
-	public String getErrorString(Context context) {
-		return context.getString(resId);
-	}
-
+    SUCCESS(0, R.string.download_successful),
+    ERROR_PARSER_EXCEPTION(1, R.string.download_error_parser_exception),
+    ERROR_UNSUPPORTED_TYPE(2, R.string.download_error_unsupported_type),
+    ERROR_CONNECTION_ERROR(3, R.string.download_error_connection_error),
+    ERROR_MALFORMED_URL(4, R.string.download_error_error_unknown),
+    ERROR_IO_ERROR(5, R.string.download_error_io_error),
+    ERROR_FILE_EXISTS(6, R.string.download_error_error_unknown),
+    ERROR_DOWNLOAD_CANCELLED(7, R.string.download_canceled_msg),
+    ERROR_DEVICE_NOT_FOUND(8, R.string.download_error_device_not_found),
+    ERROR_HTTP_DATA_ERROR(9, R.string.download_error_http_data_error),
+    ERROR_NOT_ENOUGH_SPACE(10, R.string.download_error_insufficient_space),
+    ERROR_UNKNOWN_HOST(11, R.string.download_error_unknown_host),
+    ERROR_REQUEST_ERROR(12, R.string.download_error_request_error),
+    ERROR_DB_ACCESS_ERROR(13, R.string.download_error_db_access),
+    ERROR_UNAUTHORIZED(14, R.string.download_error_unauthorized),
+    ERROR_FILE_TYPE(15, R.string.download_error_file_type_type),
+    ERROR_FORBIDDEN(16, R.string.download_error_forbidden),
+    ERROR_IO_WRONG_SIZE(17, R.string.download_error_wrong_size),
+    ERROR_IO_BLOCKED(18, R.string.download_error_blocked),
+    ERROR_UNSUPPORTED_TYPE_HTML(19, R.string.download_error_unsupported_type_html),
+    ERROR_NOT_FOUND(20, R.string.download_error_not_found),
+    ERROR_CERTIFICATE(21, R.string.download_error_certificate);
+
+    private final int code;
+    private final int resId;
+
+    DownloadError(int code, int resId) {
+        this.code = code;
+        this.resId = resId;
+    }
+
+    /** Return DownloadError from its associated code. */
+    public static DownloadError fromCode(int code) {
+        for (DownloadError reason : values()) {
+            if (reason.getCode() == code) {
+                return reason;
+            }
+        }
+        throw new IllegalArgumentException("unknown code: " + code);
+    }
+
+    /** Get machine-readable code. */
+    public int getCode() {
+        return code;
+    }
+
+    /** Get a human-readable string. */
+    public String getErrorString(Context context) {
+        return context.getString(resId);
+    }
 }