From 0b583e452768d5517d4951def0f023ab63fa2048 Mon Sep 17 00:00:00 2001 From: Tony Tam <149837+tonytamsf@users.noreply.github.com> Date: Sat, 17 Jul 2021 01:23:40 -0700 Subject: watch for empty getMedia() while checking for duplicates (#5274) --- .../main/java/de/danoeh/antennapod/core/storage/DBTasks.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/src/main') diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java index efd8a716e..8b0c4ed75 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java @@ -345,12 +345,12 @@ public final class DBTasks { } // Did not find item with same ID. Try to guess duplicates based on other metadata. for (FeedItem item : feed.getItems()) { - if (item.getMedia() == null || TextUtils.isEmpty(item.getMedia().getStreamUrl())) { - continue; - } - boolean isDuplicate = false; - if (TextUtils.equals(item.getMedia().getStreamUrl(), searchItem.getMedia().getStreamUrl())) { + if ((item.getMedia() != null) + && (searchItem.getMedia() != null) + && !TextUtils.isEmpty(item.getMedia().getStreamUrl()) + && !TextUtils.isEmpty(searchItem.getMedia().getStreamUrl()) + && TextUtils.equals(item.getMedia().getStreamUrl(), searchItem.getMedia().getStreamUrl())) { Log.d(TAG, "Removing duplicate episode stream url " + item.getMedia().getStreamUrl()); isDuplicate = true; } else if (TextUtils.equals(item.getTitle(), searchItem.getTitle()) -- cgit v1.2.3