diff options
Diffstat (limited to 'core/src')
13 files changed, 98 insertions, 97 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceAuthenticationException.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceAuthenticationException.java index 8bd56218c..1127d0b67 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceAuthenticationException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceAuthenticationException.java @@ -1,6 +1,7 @@ package de.danoeh.antennapod.core.gpoddernet; public class GpodnetServiceAuthenticationException extends GpodnetServiceException { + private static final long serialVersionUID = 1L; public GpodnetServiceAuthenticationException() { super(); @@ -17,5 +18,4 @@ public class GpodnetServiceAuthenticationException extends GpodnetServiceExcepti public GpodnetServiceAuthenticationException(Throwable cause) { super(cause); } - } diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceBadStatusCodeException.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceBadStatusCodeException.java index 84c085ed2..54c3bc7c8 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceBadStatusCodeException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceBadStatusCodeException.java @@ -1,12 +1,12 @@ package de.danoeh.antennapod.core.gpoddernet; class GpodnetServiceBadStatusCodeException extends GpodnetServiceException { + private static final long serialVersionUID = 1L; + private final int statusCode; public GpodnetServiceBadStatusCodeException(String message, int statusCode) { super(message); this.statusCode = statusCode; } - - } diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceException.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceException.java index 78ddfc945..7b99ddbc4 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceException.java @@ -1,6 +1,7 @@ package de.danoeh.antennapod.core.gpoddernet; public class GpodnetServiceException extends Exception { + private static final long serialVersionUID = 1L; GpodnetServiceException() { } diff --git a/core/src/main/java/de/danoeh/antennapod/core/menuhandler/MenuItemUtils.java b/core/src/main/java/de/danoeh/antennapod/core/menuhandler/MenuItemUtils.java index f63c9aeb0..8b2d4eb98 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/menuhandler/MenuItemUtils.java +++ b/core/src/main/java/de/danoeh/antennapod/core/menuhandler/MenuItemUtils.java @@ -1,6 +1,5 @@ package de.danoeh.antennapod.core.menuhandler; -import android.support.v4.view.MenuItemCompat; import android.view.Menu; import android.view.MenuItem; @@ -25,7 +24,7 @@ public class MenuItemUtils { // expand actionview if feeds are being downloaded, collapse otherwise if (checker.isRefreshing()) { MenuItem refreshItem = menu.findItem(resId); - MenuItemCompat.setActionView(refreshItem, R.layout.refresh_action_view); + refreshItem.setActionView(R.layout.refresh_action_view); return true; } else { return false; diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java index 2f1bc4207..ab1edc8e9 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java @@ -611,6 +611,8 @@ public class PlaybackService extends MediaBrowserServiceCompat { mediaPlayer.playMediaObject(playable, false, true, true); started = true; PlaybackService.this.updateMediaSessionMetadata(playable); + } else { + stopService(); } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequestException.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequestException.java index c85559e20..f152ec531 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequestException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequestException.java @@ -5,21 +5,21 @@ package de.danoeh.antennapod.core.storage; * or something went wrong while processing the request. */ public class DownloadRequestException extends Exception { + private static final long serialVersionUID = 1L; - public DownloadRequestException() { - super(); - } + public DownloadRequestException() { + super(); + } - public DownloadRequestException(String detailMessage, Throwable throwable) { - super(detailMessage, throwable); - } + public DownloadRequestException(String message, Throwable cause) { + super(message, cause); + } - public DownloadRequestException(String detailMessage) { - super(detailMessage); - } - - public DownloadRequestException(Throwable throwable) { - super(throwable); - } + public DownloadRequestException(String message) { + super(message); + } + public DownloadRequestException(Throwable cause) { + super(cause); + } } 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 fd7d0a4e1..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 @@ -3,44 +3,42 @@ package de.danoeh.antennapod.core.syndication.handler; import de.danoeh.antennapod.core.syndication.handler.TypeGetter.Type; public class UnsupportedFeedtypeException extends Exception { - private static final long serialVersionUID = 9105878964928170669L; - private final TypeGetter.Type type; - private String rootElement; - private String message = null; - - public UnsupportedFeedtypeException(Type type) { - super(); - this.type = type; - } + private static final long serialVersionUID = 9105878964928170669L; + private final TypeGetter.Type type; + private String rootElement; + private String message = null; + + public UnsupportedFeedtypeException(Type type) { + super(); + this.type = type; + } public UnsupportedFeedtypeException(Type type, String rootElement) { this.type = type; this.rootElement = rootElement; } - public UnsupportedFeedtypeException(String message) { - this.message = message; - type = Type.INVALID; - } + public UnsupportedFeedtypeException(String message) { + this.message = message; + type = Type.INVALID; + } public TypeGetter.Type getType() { - return type; - } + return type; + } public String getRootElement() { return rootElement; } @Override - public String getMessage() { - if (message != null) { - return message; - } else if (type == TypeGetter.Type.INVALID) { - return "Invalid type"; - } else { - return "Type " + type + " not supported"; - } - } - - + public String getMessage() { + if (message != null) { + return message; + } else if (type == TypeGetter.Type.INVALID) { + return "Invalid type"; + } else { + return "Type " + type + " not supported"; + } + } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/InvalidFeedException.java b/core/src/main/java/de/danoeh/antennapod/core/util/InvalidFeedException.java index c98c2d82a..a2795194d 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/InvalidFeedException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/InvalidFeedException.java @@ -1,21 +1,23 @@ package de.danoeh.antennapod.core.util; -/** Thrown if a feed has invalid attribute values. */ +/** + * Thrown if a feed has invalid attribute values. + */ public class InvalidFeedException extends Exception { + private static final long serialVersionUID = 1L; - public InvalidFeedException() { - } + public InvalidFeedException() { + } - public InvalidFeedException(String detailMessage) { - super(detailMessage); - } + public InvalidFeedException(String message) { + super(message); + } - public InvalidFeedException(Throwable throwable) { - super(throwable); - } - - public InvalidFeedException(String detailMessage, Throwable throwable) { - super(detailMessage, throwable); - } + public InvalidFeedException(Throwable cause) { + super(cause); + } + public InvalidFeedException(String message, Throwable cause) { + super(message, cause); + } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/exception/MediaFileNotFoundException.java b/core/src/main/java/de/danoeh/antennapod/core/util/exception/MediaFileNotFoundException.java index 3000e2fa4..f9e2e9991 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/exception/MediaFileNotFoundException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/exception/MediaFileNotFoundException.java @@ -3,16 +3,16 @@ package de.danoeh.antennapod.core.util.exception; import de.danoeh.antennapod.core.feed.FeedMedia; public class MediaFileNotFoundException extends Exception { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - private final FeedMedia media; + private final FeedMedia media; - public MediaFileNotFoundException(String msg, FeedMedia media) { - super(msg); - this.media = media; - } + public MediaFileNotFoundException(String msg, FeedMedia media) { + super(msg); + this.media = media; + } - public FeedMedia getMedia() { - return media; - } + public FeedMedia getMedia() { + return media; + } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3ReaderException.java b/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3ReaderException.java index 0c746d7e5..021268adb 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3ReaderException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3ReaderException.java @@ -1,20 +1,20 @@ package de.danoeh.antennapod.core.util.id3reader; public class ID3ReaderException extends Exception { + private static final long serialVersionUID = 1L; - public ID3ReaderException() { - } + public ID3ReaderException() { + } - public ID3ReaderException(String arg0) { - super(arg0); - } + public ID3ReaderException(String message) { + super(message); + } - public ID3ReaderException(Throwable arg0) { - super(arg0); - } - - public ID3ReaderException(String arg0, Throwable arg1) { - super(arg0, arg1); - } + public ID3ReaderException(Throwable message) { + super(message); + } + public ID3ReaderException(String message, Throwable cause) { + super(message, cause); + } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/syndication/HtmlToPlainText.java b/core/src/main/java/de/danoeh/antennapod/core/util/syndication/HtmlToPlainText.java index cc6a8ec90..61072f1ad 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/syndication/HtmlToPlainText.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/syndication/HtmlToPlainText.java @@ -33,8 +33,8 @@ public class HtmlToPlainText { */ public String getPlainText(Element element) { FormattingVisitor formatter = new FormattingVisitor(); - NodeTraversor traversor = new NodeTraversor(formatter); - traversor.traverse(element); // walk the DOM, and call .head() and .tail() for each node + // walk the DOM, and call .head() and .tail() for each node + NodeTraversor.traverse(formatter, element); return formatter.toString(); } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentReaderException.java b/core/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentReaderException.java index 89ab20db0..8b0f3052b 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentReaderException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentReaderException.java @@ -1,24 +1,21 @@ package de.danoeh.antennapod.core.util.vorbiscommentreader; -public class VorbisCommentReaderException extends Exception { - public VorbisCommentReaderException() { - super(); - // TODO Auto-generated constructor stub - } +public class VorbisCommentReaderException extends Exception { + private static final long serialVersionUID = 1L; - public VorbisCommentReaderException(String arg0, Throwable arg1) { - super(arg0, arg1); - // TODO Auto-generated constructor stub - } + public VorbisCommentReaderException() { + super(); + } - public VorbisCommentReaderException(String arg0) { - super(arg0); - // TODO Auto-generated constructor stub - } + public VorbisCommentReaderException(String message, Throwable cause) { + super(message, cause); + } - public VorbisCommentReaderException(Throwable arg0) { - super(arg0); - // TODO Auto-generated constructor stub - } + public VorbisCommentReaderException(String message) { + super(message); + } + public VorbisCommentReaderException(Throwable message) { + super(message); + } } diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml index 49ebb7416..0eaf0e5e7 100644 --- a/core/src/main/res/values/arrays.xml +++ b/core/src/main/res/values/arrays.xml @@ -49,6 +49,7 @@ <item>25</item> <item>50</item> <item>100</item> + <item>500</item> <item>@string/pref_episode_cache_unlimited</item> </string-array> @@ -58,6 +59,7 @@ <item>25</item> <item>50</item> <item>100</item> + <item>500</item> <item>-1</item> </string-array> |