Fix subscribing with discovery dialog (#7391)

1 files changed, 6 insertions, 2 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java
index 7e994b1ed..952c4f157 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java
@@ -279,8 +279,12 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
 
     private void parseFeed(String destination) {
         Log.d(TAG, "Parsing feed");
-        parser = Observable.fromCallable(() -> {
+        parser = Maybe.<Long>create(emitter -> {
             FeedHandlerResult handlerResult = doParseFeed(destination);
+            if (handlerResult == null) { // Started another attempt with another url
+                emitter.onComplete();
+                return;
+            }
             Feed feed = handlerResult.feed;
             feed.setState(Feed.STATE_NOT_SUBSCRIBED);
             feed.setLastRefreshAttempt(System.currentTimeMillis());
@@ -288,7 +292,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
             Feed feedFromDb = DBReader.getFeed(feed.getId(), false, 0, Integer.MAX_VALUE);
             feedFromDb.getPreferences().setKeepUpdated(false);
             DBWriter.setFeedPreferences(feedFromDb.getPreferences());
-            return feed.getId();
+            emitter.onSuccess(feed.getId());
         })
         .subscribeOn(Schedulers.computation())
         .observeOn(AndroidSchedulers.mainThread())