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 /app/src/main/java/de/danoeh/antennapod/adapter | |
| 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 'app/src/main/java/de/danoeh/antennapod/adapter')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java | 2 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java index 2c6aa8f72..7c0be47b6 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java @@ -29,7 +29,7 @@ import de.danoeh.antennapod.core.storage.DownloadRequestException; /** Displays a list of DownloadStatus entries. */ public class DownloadLogAdapter extends BaseAdapter { - private final String TAG = "DownloadLogAdapter"; + private static final String TAG = "DownloadLogAdapter"; private final Context context; diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java index 10b5330c1..e493a2ecc 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java @@ -162,7 +162,7 @@ public class ItunesAdapter extends ArrayAdapter<ItunesAdapter.Podcast> { /** * View holder object for the GridView */ - class PodcastViewHolder { + static class PodcastViewHolder { /** * ImageView holding the Podcast image |