diff options
| author | Martin Fietz <martin.fietz@gmail.com> | 2018-01-21 11:10:20 +0100 |
|---|---|---|
| committer | Martin Fietz <martin.fietz@gmail.com> | 2018-01-21 11:10:20 +0100 |
| commit | d3491d1858bf33f894f07652169254b5821b0e9d (patch) | |
| tree | 74449084cd33cdcdf9a2c04291ba5c9d36defffb /core/src/main/java | |
| parent | e4770e7edce8116f764fdb748cb3d4252c91b8dd (diff) | |
| parent | f7c048e5b4717a997c26be42332395dc3b0f6f02 (diff) | |
| download | AntennaPod-d3491d1858bf33f894f07652169254b5821b0e9d.zip | |
Merge branch 'develop' into refactor
# Conflicts:
# app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
# core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
Diffstat (limited to 'core/src/main/java')
4 files changed, 7 insertions, 7 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 44861f8d1..d66af22ef 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 @@ -127,8 +127,8 @@ public class DownloadService extends Service { private NotificationCompat.Builder notificationCompatBuilder; - private final int NOTIFICATION_ID = 2; - private final int REPORT_ID = 3; + private static final int NOTIFICATION_ID = 2; + private static final int REPORT_ID = 3; /** * Currently running downloads. @@ -611,7 +611,7 @@ public class DownloadService extends Service { private volatile boolean isActive = true; private volatile boolean isCollectingRequests = false; - private final long WAIT_TIMEOUT = 3000; + private static final long WAIT_TIMEOUT = 3000; /** @@ -950,7 +950,7 @@ public class DownloadService extends Service { * <p/> * Currently, this handler only handles FeedMedia objects, because Feeds and FeedImages are deleted if the download fails. */ - private class FailedDownloadHandler implements Runnable { + private static class FailedDownloadHandler implements Runnable { private final DownloadRequest request; private final DownloadStatus status; 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 2bb20482c..181a6f619 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 @@ -314,7 +314,7 @@ public class HttpDownloader extends Downloader { } } - private class BasicAuthorizationInterceptor implements Interceptor { + private static class BasicAuthorizationInterceptor implements Interceptor { private final DownloadRequest downloadRequest; diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java index 460f9b661..67f42bc93 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java @@ -44,7 +44,7 @@ import de.greenrobot.event.EventBus; public class PodDBAdapter { private static final String TAG = "PodDBAdapter"; - private static final String DATABASE_NAME = "Antennapod.db"; + public static final String DATABASE_NAME = "Antennapod.db"; /** * Maximum number of arguments for IN-operator. 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 642b75ffd..cc6a8ec90 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 @@ -40,7 +40,7 @@ public class HtmlToPlainText { } // the formatting rules, implemented in a breadth-first DOM traverse - private class FormattingVisitor implements NodeVisitor { + private static class FormattingVisitor implements NodeVisitor { private final StringBuilder accum = new StringBuilder(); // holds the accumulated text |