diff options
| author | ByteHamster <info@bytehamster.com> | 2021-03-03 14:32:28 +0100 |
|---|---|---|
| committer | ByteHamster <info@bytehamster.com> | 2021-03-03 14:32:28 +0100 |
| commit | 8f1b91c733280133667fb62187f089af11f2e171 (patch) | |
| tree | c48698af80103a5daf77f67a2c3763eeef825676 /core/src/main/java | |
| parent | 213099fec6481f9816effa9c9055e751a0ebf31f (diff) | |
| parent | d0b1939ac6e4da0937f59503bb89d85a19652ef1 (diff) | |
| download | AntennaPod-8f1b91c733280133667fb62187f089af11f2e171.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'core/src/main/java')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java | 4 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/util/DownloadError.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java index 44b673a4d..2e0cb705b 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java @@ -640,7 +640,9 @@ public class DownloadService extends Service { // If the service was run for a very short time, the system may delay closing // the notification. Set the notification text now so that a misleading message // is not left on the notification. - notificationUpdater.run(); + if (notificationUpdater != null) { + notificationUpdater.run(); + } cancelNotificationUpdater(); stopForeground(true); stopSelf(); 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 babf3a846..b5288b7c7 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 @@ -23,7 +23,7 @@ public enum DownloadError { 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_forbidden); + ERROR_IO_WRONG_SIZE(17, R.string.download_wrong_size); private final int code; private final int resId; |