Update feed url when server returns itunes:new-feed-url (#6291)

core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java

@@ -273,8 +273,8 @@ public class DownloadService extends Service {
 
         if (type == Feed.FEEDFILETYPE_FEED) {
             Log.d(TAG, "Handling completed Feed Download");
-            FeedSyncTask task = new FeedSyncTask(DownloadService.this, request);
+            FeedSyncTask feedSyncTask = new FeedSyncTask(DownloadService.this, request);
-            boolean success = task.run();
+            boolean success = feedSyncTask.run();
 
             if (success) {
                 if (request.getFeedfileId() == 0) {
@@ -283,18 +283,20 @@ public class DownloadService extends Service {
                 // we create a 'successful' download log if the feed's last refresh failed
                 List<DownloadStatus> log = DBReader.getFeedDownloadLog(request.getFeedfileId());
                 if (log.size() > 0 && !log.get(0).isSuccessful()) {
-                    saveDownloadStatus(task.getDownloadStatus());
+                    saveDownloadStatus(feedSyncTask.getDownloadStatus());
                 }
                 if (!request.isInitiatedByUser()) {
                     // Was stored in the database before and not initiated manually
-                    newEpisodesNotification.showIfNeeded(DownloadService.this, task.getSavedFeed());
+                    newEpisodesNotification.showIfNeeded(DownloadService.this, feedSyncTask.getSavedFeed());
                 }
                 if (downloader.permanentRedirectUrl != null) {
                     DBWriter.updateFeedDownloadURL(request.getSource(), downloader.permanentRedirectUrl);
+                } else if (feedSyncTask.getRedirectUrl() != null) {
+                    DBWriter.updateFeedDownloadURL(request.getSource(), feedSyncTask.getRedirectUrl());
                 }
             } else {
                 DBWriter.setFeedLastUpdateFailed(request.getFeedfileId(), true);
-                saveDownloadStatus(task.getDownloadStatus());
+                saveDownloadStatus(feedSyncTask.getDownloadStatus());
             }
         } else if (type == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
             Log.d(TAG, "Handling completed FeedMedia Download");

core/src/main/java/de/danoeh/antennapod/core/service/download/handler/FeedSyncTask.java

@@ -14,6 +14,7 @@ public class FeedSyncTask {
     private final Context context;
     private Feed savedFeed;
     private final FeedParserTask task;
+    private FeedHandlerResult feedHandlerResult;
 
     public FeedSyncTask(Context context, DownloadRequest request) {
         this.request = request;
@@ -22,15 +23,15 @@ public class FeedSyncTask {
     }
 
     public boolean run() {
-        FeedHandlerResult result = task.call();
+        feedHandlerResult = task.call();
         if (!task.isSuccessful()) {
             return false;
         }
 
-        savedFeed = DBTasks.updateFeed(context, result.feed, false);
+        savedFeed = DBTasks.updateFeed(context, feedHandlerResult.feed, false);
         // If loadAllPages=true, check if another page is available and queue it for download
         final boolean loadAllPages = request.getArguments().getBoolean(DownloadRequest.REQUEST_ARG_LOAD_ALL_PAGES);
-        final Feed feed = result.feed;
+        final Feed feed = feedHandlerResult.feed;
         if (loadAllPages && feed.getNextPageLink() != null) {
             feed.setId(savedFeed.getId());
             DBTasks.loadNextPageOfFeed(context, feed, true);
@@ -46,4 +47,8 @@ public class FeedSyncTask {
     public Feed getSavedFeed() {
         return savedFeed;
     }
+
+    public String getRedirectUrl() {
+        return feedHandlerResult.redirectUrl;
+    }
 }

parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/FeedHandler.java

@@ -31,6 +31,6 @@ public class FeedHandler {
 
         saxParser.parse(inputSource, handler);
         inputStreamReader.close();
-        return new FeedHandlerResult(handler.state.feed, handler.state.alternateUrls);
+        return new FeedHandlerResult(handler.state.feed, handler.state.alternateUrls, handler.state.redirectUrl);
     }
 }

parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/FeedHandlerResult.java

@@ -11,9 +11,11 @@ public class FeedHandlerResult {
 
     public final Feed feed;
     public final Map<String, String> alternateFeedUrls;
+    public final String redirectUrl;
 
-    public FeedHandlerResult(Feed feed, Map<String, String> alternateFeedUrls) {
+    public FeedHandlerResult(Feed feed, Map<String, String> alternateFeedUrls, String redirectUrl) {
         this.feed = feed;
         this.alternateFeedUrls = alternateFeedUrls;
+        this.redirectUrl = redirectUrl;
     }
 }

parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/HandlerState.java

@@ -26,6 +26,7 @@ public class HandlerState {
      * URL of the feed, the value is the title
      */
     public final Map<String, String> alternateUrls;
+    public String redirectUrl = null;
     private final ArrayList<FeedItem> items;
     private FeedItem currentItem;
     private FeedFunding currentFunding;

parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/namespace/Itunes.java

@@ -23,6 +23,7 @@ public class Itunes extends Namespace {
     public static final String DURATION = "duration";
     private static final String SUBTITLE = "subtitle";
     private static final String SUMMARY = "summary";
+    private static final String NEW_FEED_URL = "new-feed-url";
 
     @Override
     public SyndElement handleElementStart(String localName, HandlerState state,
@@ -76,6 +77,8 @@ public class Itunes extends Namespace {
             } else if (Rss20.CHANNEL.equals(state.getSecondTag().getName()) && state.getFeed() != null) {
                 state.getFeed().setDescription(content);
             }
+        } else if (NEW_FEED_URL.equals(localName) && content.trim().startsWith("http")) {
+            state.redirectUrl = content.trim();
         }
     }
 }