Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix subscribing with discovery dialog (#7391)

This commit is contained in:
ByteHamster 2024-09-08 15:49:38 +02:00 committed by GitHub
parent 5ea92f68b1
commit 8961405d5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java
View File

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