summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorByteHamster <ByteHamster@users.noreply.github.com>2024-03-23 11:27:55 +0100
committerGitHub <noreply@github.com>2024-03-23 11:27:55 +0100
commitf6b45e7162ce3909cb2b04a4124e71aad22240c6 (patch)
tree9aa8a0b64b399c99da4e8d82ad4dae146a10564f /app/src
parentf20ce1fc690788273bb779663a4f3211f47a0973 (diff)
downloadAntennaPod-f6b45e7162ce3909cb2b04a4124e71aad22240c6.zip
Rename FeedMedia methods to no longer have underscores (#7017)
Diffstat (limited to 'app/src')
-rw-r--r--app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java10
-rw-r--r--app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java2
-rw-r--r--app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java6
-rw-r--r--app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java8
-rw-r--r--app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/Rss2Generator.java4
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java6
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/dialog/DownloadLogDetailsDialog.java4
-rw-r--r--app/src/main/java/de/danoeh/antennapod/dialog/EditUrlSettingsDialog.java6
-rw-r--r--app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java14
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java10
-rw-r--r--app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java6
-rw-r--r--app/src/main/java/de/danoeh/antennapod/view/viewholder/HorizontalItemViewHolder.java6
17 files changed, 46 insertions, 46 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java b/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java
index 46800dd50..dcd27d3b4 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java
@@ -67,7 +67,7 @@ public class HttpDownloaderTest {
if (deleteExisting) {
Log.d(TAG, "Deleting file: " + file.delete());
}
- feedfile.setFile_url(fileUrl);
+ feedfile.setLocalFileUrl(fileUrl);
return feedfile;
}
@@ -78,7 +78,7 @@ public class HttpDownloaderTest {
private Downloader download(String url, String title, boolean expectedResult, boolean deleteExisting,
String username, String password) {
Feed feedFile = setupFeedFile(url, title, deleteExisting);
- DownloadRequest request = new DownloadRequest(feedFile.getFile_url(), url, title, 0, Feed.FEEDFILETYPE_FEED,
+ DownloadRequest request = new DownloadRequest(feedFile.getLocalFileUrl(), url, title, 0, Feed.FEEDFILETYPE_FEED,
username, password, null, false);
Downloader downloader = new HttpDownloader(request);
downloader.call();
@@ -86,7 +86,7 @@ public class HttpDownloaderTest {
assertNotNull(status);
assertEquals(expectedResult, status.isSuccessful());
// the file should not exist if the download has failed and deleteExisting was true
- assertTrue(!deleteExisting || new File(feedFile.getFile_url()).exists() == expectedResult);
+ assertTrue(!deleteExisting || new File(feedFile.getLocalFileUrl()).exists() == expectedResult);
return downloader;
}
@@ -114,8 +114,8 @@ public class HttpDownloaderTest {
public void testCancel() {
final String url = httpServer.getBaseUrl() + "/delay/3";
Feed feedFile = setupFeedFile(url, "delay", true);
- final Downloader downloader = new HttpDownloader(new DownloadRequest(feedFile.getFile_url(), url, "delay", 0,
- Feed.FEEDFILETYPE_FEED, null, null, null, false));
+ final Downloader downloader = new HttpDownloader(new DownloadRequest(feedFile.getLocalFileUrl(),
+ url, "delay", 0, Feed.FEEDFILETYPE_FEED, null, null, null, false));
Thread t = new Thread() {
@Override
public void run() {
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
index a55670ed6..d0ce7d08f 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
@@ -63,7 +63,7 @@ public class MainActivityTest {
openNavDrawer();
onView(withText(R.string.add_feed_label)).perform(click());
onView(withId(R.id.addViaUrlButton)).perform(scrollTo(), click());
- onView(withId(R.id.urlEditText)).perform(replaceText(feed.getDownload_url()));
+ onView(withId(R.id.urlEditText)).perform(replaceText(feed.getDownloadUrl()));
onView(withText(R.string.confirm_label)).perform(scrollTo(), click());
// subscribe podcast
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
index c03480fc6..0202d9d48 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
@@ -138,7 +138,7 @@ public class UITestUtils {
}
}
feed.setItems(items);
- feed.setDownload_url(hostFeed(feed));
+ feed.setDownloadUrl(hostFeed(feed));
hostedFeeds.add(feed);
}
feedDataHosted = true;
@@ -174,8 +174,8 @@ public class UITestUtils {
for (FeedItem item : feed.getItems()) {
if (item.hasMedia()) {
FeedMedia media = item.getMedia();
- int fileId = Integer.parseInt(StringUtils.substringAfter(media.getDownload_url(), "files/"));
- media.setFile_url(server.accessFile(fileId).getAbsolutePath());
+ int fileId = Integer.parseInt(StringUtils.substringAfter(media.getDownloadUrl(), "files/"));
+ media.setLocalFileUrl(server.accessFile(fileId).getAbsolutePath());
media.setDownloaded(true);
}
}
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java
index 36f0cf2a5..377904e30 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java
@@ -45,10 +45,10 @@ public class UITestUtilsTest {
assertFalse(feeds.isEmpty());
for (Feed feed : feeds) {
- testUrlReachable(feed.getDownload_url());
+ testUrlReachable(feed.getDownloadUrl());
for (FeedItem item : feed.getItems()) {
if (item.hasMedia()) {
- testUrlReachable(item.getMedia().getDownload_url());
+ testUrlReachable(item.getMedia().getDownloadUrl());
}
}
}
@@ -77,8 +77,8 @@ public class UITestUtilsTest {
assertTrue(item.getMedia().getId() != 0);
if (downloadEpisodes) {
assertTrue(item.getMedia().isDownloaded());
- assertNotNull(item.getMedia().getFile_url());
- File file = new File(item.getMedia().getFile_url());
+ assertNotNull(item.getMedia().getLocalFileUrl());
+ File file = new File(item.getMedia().getLocalFileUrl());
assertTrue(file.exists());
}
}
diff --git a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/Rss2Generator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/Rss2Generator.java
index ec4a58e33..d3d062301 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/Rss2Generator.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/Rss2Generator.java
@@ -110,9 +110,9 @@ public class Rss2Generator implements FeedGenerator {
}
if (item.getMedia() != null) {
xml.startTag(null, "enclosure");
- xml.attribute(null, "url", item.getMedia().getDownload_url());
+ xml.attribute(null, "url", item.getMedia().getDownloadUrl());
xml.attribute(null, "length", String.valueOf(item.getMedia().getSize()));
- xml.attribute(null, "type", item.getMedia().getMime_type());
+ xml.attribute(null, "type", item.getMedia().getMimeType());
xml.endTag(null, "enclosure");
}
if (fundingList != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index afbeb76ea..c48bb5995 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -382,7 +382,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
private FeedHandlerResult doParseFeed(String destination) throws Exception {
FeedHandler handler = new FeedHandler();
Feed feed = new Feed(selectedDownloadUrl, null);
- feed.setFile_url(destination);
+ feed.setLocalFileUrl(destination);
File destinationFile = new File(destination);
try {
return handler.parseFeed(feed);
@@ -485,7 +485,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
final List<String> alternateUrlsList = new ArrayList<>();
final List<String> alternateUrlsTitleList = new ArrayList<>();
- alternateUrlsList.add(feed.getDownload_url());
+ alternateUrlsList.add(feed.getDownloadUrl());
alternateUrlsTitleList.add(feed.getTitle());
@@ -577,7 +577,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
return 0;
}
for (Feed f : feeds) {
- if (f.getDownload_url().equals(selectedDownloadUrl)) {
+ if (f.getDownloadUrl().equals(selectedDownloadUrl)) {
return f.getId();
}
}
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 3b08674af..93fc11cfa 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -553,7 +553,7 @@ public class VideoplayerActivity extends CastEnabledActivity implements SeekBar.
menu.findItem(R.id.visit_website_item).setVisible(hasWebsiteLink);
boolean isItemAndHasLink = isFeedMedia && ShareUtils.hasLinkToShare(((FeedMedia) media).getItem());
- boolean isItemHasDownloadLink = isFeedMedia && ((FeedMedia) media).getDownload_url() != null;
+ boolean isItemHasDownloadLink = isFeedMedia && ((FeedMedia) media).getDownloadUrl() != null;
menu.findItem(R.id.share_item).setVisible(hasWebsiteLink || isItemAndHasLink || isItemHasDownloadLink);
menu.findItem(R.id.add_to_favorites_item).setVisible(false);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java
index 31ab2195c..754e2b124 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java
@@ -68,7 +68,7 @@ public class DownloadActionButton extends ItemActionButton {
}
private boolean shouldNotDownload(@NonNull FeedMedia media) {
- boolean isDownloading = DownloadServiceInterface.get().isDownloadingEpisode(media.getDownload_url());
+ boolean isDownloading = DownloadServiceInterface.get().isDownloadingEpisode(media.getDownloadUrl());
return isDownloading || media.isDownloaded();
}
}
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java
index 613dd32f0..58ed6f412 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java
@@ -39,7 +39,7 @@ public abstract class ItemActionButton {
return new MarkAsPlayedActionButton(item);
}
- final boolean isDownloadingMedia = DownloadServiceInterface.get().isDownloadingEpisode(media.getDownload_url());
+ final boolean isDownloadingMedia = DownloadServiceInterface.get().isDownloadingEpisode(media.getDownloadUrl());
if (PlaybackStatus.isCurrentlyPlaying(media)) {
return new PauseActionButton(item);
} else if (item.getFeed().isLocalFeed()) {
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/DownloadLogDetailsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/DownloadLogDetailsDialog.java
index 2c18a23fa..6a6ba4339 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/DownloadLogDetailsDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/DownloadLogDetailsDialog.java
@@ -26,12 +26,12 @@ public class DownloadLogDetailsDialog extends MaterialAlertDialogBuilder {
if (status.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
FeedMedia media = DBReader.getFeedMedia(status.getFeedfileId());
if (media != null) {
- url = media.getDownload_url();
+ url = media.getDownloadUrl();
}
} else if (status.getFeedfileType() == Feed.FEEDFILETYPE_FEED) {
Feed feed = DBReader.getFeed(status.getFeedfileId());
if (feed != null) {
- url = feed.getDownload_url();
+ url = feed.getDownloadUrl();
}
}
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EditUrlSettingsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/EditUrlSettingsDialog.java
index 1929b997e..0edb66b64 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EditUrlSettingsDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EditUrlSettingsDialog.java
@@ -33,7 +33,7 @@ public abstract class EditUrlSettingsDialog {
final EditTextDialogBinding binding = EditTextDialogBinding.inflate(LayoutInflater.from(activity));
- binding.urlEditText.setText(feed.getDownload_url());
+ binding.urlEditText.setText(feed.getDownloadUrl());
new MaterialAlertDialogBuilder(activity)
.setView(binding.getRoot())
@@ -47,7 +47,7 @@ public abstract class EditUrlSettingsDialog {
private void onConfirmed(String original, String updated) {
try {
DBWriter.updateFeedDownloadURL(original, updated).get();
- feed.setDownload_url(updated);
+ feed.setDownloadUrl(updated);
FeedUpdateManager.runOnce(activityRef.get(), feed);
} catch (ExecutionException | InterruptedException e) {
throw new RuntimeException(e);
@@ -61,7 +61,7 @@ public abstract class EditUrlSettingsDialog {
.setTitle(R.string.edit_url_menu)
.setMessage(R.string.edit_url_confirmation_msg)
.setPositiveButton(android.R.string.ok, (d, input) -> {
- onConfirmed(feed.getDownload_url(), url);
+ onConfirmed(feed.getDownloadUrl(), url);
setUrl(url);
})
.setNegativeButton(R.string.cancel_label, null)
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java
index fd52b2ac2..5fb8a352f 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java
@@ -82,7 +82,7 @@ public class ShareDialog extends BottomSheetDialogFragment {
boolean downloaded = hasMedia && item.getMedia().isDownloaded();
viewBinding.shareMediaFileRadio.setVisibility(downloaded ? View.VISIBLE : View.GONE);
- boolean hasDownloadUrl = hasMedia && item.getMedia().getDownload_url() != null;
+ boolean hasDownloadUrl = hasMedia && item.getMedia().getDownloadUrl() != null;
if (!hasDownloadUrl) {
viewBinding.shareMediaReceiverRadio.setVisibility(View.GONE);
}
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java
index f62bdaf84..47eb93d7e 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java
@@ -92,8 +92,8 @@ public class FeedInfoFragment extends Fragment implements MaterialToolbar.OnMenu
private final View.OnClickListener copyUrlToClipboard = new View.OnClickListener() {
@Override
public void onClick(View v) {
- if (feed != null && feed.getDownload_url() != null) {
- String url = feed.getDownload_url();
+ if (feed != null && feed.getDownloadUrl() != null) {
+ String url = feed.getDownloadUrl();
ClipData clipData = ClipData.newPlainText(url, url);
android.content.ClipboardManager cm = (android.content.ClipboardManager) getContext()
.getSystemService(Context.CLIPBOARD_SERVICE);
@@ -198,7 +198,7 @@ public class FeedInfoFragment extends Fragment implements MaterialToolbar.OnMenu
private void showFeed() {
Log.d(TAG, "Language is " + feed.getLanguage());
Log.d(TAG, "Author is " + feed.getAuthor());
- Log.d(TAG, "URL is " + feed.getDownload_url());
+ Log.d(TAG, "URL is " + feed.getDownloadUrl());
Glide.with(this)
.load(feed.getImageUrl())
.apply(new RequestOptions()
@@ -227,7 +227,7 @@ public class FeedInfoFragment extends Fragment implements MaterialToolbar.OnMenu
txtvAuthorHeader.setText(feed.getAuthor());
}
- txtvUrl.setText(feed.getDownload_url());
+ txtvUrl.setText(feed.getDownloadUrl());
txtvUrl.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_paperclip, 0);
if (feed.getPaymentLinks() == null || feed.getPaymentLinks().size() == 0) {
@@ -309,8 +309,8 @@ public class FeedInfoFragment extends Fragment implements MaterialToolbar.OnMenu
new EditUrlSettingsDialog(getActivity(), feed) {
@Override
protected void setUrl(String url) {
- feed.setDownload_url(url);
- txtvUrl.setText(feed.getDownload_url());
+ feed.setDownloadUrl(url);
+ txtvUrl.setText(feed.getDownloadUrl());
txtvUrl.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_paperclip, 0);
}
}.show();
@@ -339,7 +339,7 @@ public class FeedInfoFragment extends Fragment implements MaterialToolbar.OnMenu
if (documentFile == null) {
throw new IllegalArgumentException("Unable to retrieve document tree");
}
- feed.setDownload_url(Feed.PREFIX_LOCAL_FOLDER + uri.toString());
+ feed.setDownloadUrl(Feed.PREFIX_LOCAL_FOLDER + uri.toString());
DBTasks.updateFeed(getContext(), feed, true);
})
.subscribeOn(Schedulers.io())
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
index b48e99240..800541228 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
@@ -276,7 +276,7 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
FeedUpdateManager.runOnceOrAsk(getContext(), feed);
} else if (item.getItemId() == R.id.refresh_complete_item) {
new Thread(() -> {
- feed.setNextPageLink(feed.getDownload_url());
+ feed.setNextPageLink(feed.getDownloadUrl());
feed.setPageNr(0);
try {
DBWriter.resetPagedFeedPage(feed).get();
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
index fd8e75d68..b06ea90f8 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -304,12 +304,12 @@ public class ItemFragment extends Fragment {
private void updateButtons() {
progbarDownload.setVisibility(View.GONE);
if (item.hasMedia()) {
- if (DownloadServiceInterface.get().isDownloadingEpisode(item.getMedia().getDownload_url())) {
+ if (DownloadServiceInterface.get().isDownloadingEpisode(item.getMedia().getDownloadUrl())) {
progbarDownload.setVisibility(View.VISIBLE);
progbarDownload.setPercentage(0.01f * Math.max(1,
- DownloadServiceInterface.get().getProgress(item.getMedia().getDownload_url())), item);
+ DownloadServiceInterface.get().getProgress(item.getMedia().getDownloadUrl())), item);
progbarDownload.setIndeterminate(
- DownloadServiceInterface.get().isEpisodeQueued(item.getMedia().getDownload_url()));
+ DownloadServiceInterface.get().isEpisodeQueued(item.getMedia().getDownloadUrl()));
}
}
@@ -334,7 +334,7 @@ public class ItemFragment extends Fragment {
} else {
actionButton1 = new StreamActionButton(item);
}
- if (DownloadServiceInterface.get().isDownloadingEpisode(media.getDownload_url())) {
+ if (DownloadServiceInterface.get().isDownloadingEpisode(media.getDownloadUrl())) {
actionButton2 = new CancelDownloadActionButton(item);
} else if (!media.isDownloaded()) {
actionButton2 = new DownloadActionButton(item);
@@ -383,7 +383,7 @@ public class ItemFragment extends Fragment {
if (item == null || item.getMedia() == null) {
return;
}
- if (!event.getUrls().contains(item.getMedia().getDownload_url())) {
+ if (!event.getUrls().contains(item.getMedia().getDownloadUrl())) {
return;
}
if (itemsLoaded && getActivity() != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java b/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java
index 391270fe0..a57900da8 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java
@@ -148,11 +148,11 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder {
itemView.setBackgroundResource(ThemeUtils.getDrawableFromAttr(activity, R.attr.selectableItemBackground));
}
- if (DownloadServiceInterface.get().isDownloadingEpisode(media.getDownload_url())) {
- float percent = 0.01f * DownloadServiceInterface.get().getProgress(media.getDownload_url());
+ if (DownloadServiceInterface.get().isDownloadingEpisode(media.getDownloadUrl())) {
+ float percent = 0.01f * DownloadServiceInterface.get().getProgress(media.getDownloadUrl());
secondaryActionProgress.setPercentage(Math.max(percent, 0.01f), item);
secondaryActionProgress.setIndeterminate(
- DownloadServiceInterface.get().isEpisodeQueued(media.getDownload_url()));
+ DownloadServiceInterface.get().isEpisodeQueued(media.getDownloadUrl()));
} else if (media.isDownloaded()) {
secondaryActionProgress.setPercentage(1, item); // Do not animate 100% -> 0%
secondaryActionProgress.setIndeterminate(false);
diff --git a/app/src/main/java/de/danoeh/antennapod/view/viewholder/HorizontalItemViewHolder.java b/app/src/main/java/de/danoeh/antennapod/view/viewholder/HorizontalItemViewHolder.java
index c1657b303..64867466a 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/viewholder/HorizontalItemViewHolder.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/viewholder/HorizontalItemViewHolder.java
@@ -85,11 +85,11 @@ public class HorizontalItemViewHolder extends RecyclerView.ViewHolder {
setProgressBar(false, 0);
}
- if (DownloadServiceInterface.get().isDownloadingEpisode(media.getDownload_url())) {
- float percent = 0.01f * DownloadServiceInterface.get().getProgress(media.getDownload_url());
+ if (DownloadServiceInterface.get().isDownloadingEpisode(media.getDownloadUrl())) {
+ float percent = 0.01f * DownloadServiceInterface.get().getProgress(media.getDownloadUrl());
circularProgressBar.setPercentage(Math.max(percent, 0.01f), item);
circularProgressBar.setIndeterminate(
- DownloadServiceInterface.get().isEpisodeQueued(media.getDownload_url()));
+ DownloadServiceInterface.get().isEpisodeQueued(media.getDownloadUrl()));
} else if (media.isDownloaded()) {
circularProgressBar.setPercentage(1, item); // Do not animate 100% -> 0%
circularProgressBar.setIndeterminate(false);