Merge pull request #3349 from ByteHamster/no-crash-after-dispose

Do not crash on undeliverable InterruptedException

1 files changed, 5 insertions, 9 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/discovery/ItunesTopListLoader.java b/app/src/main/java/de/danoeh/antennapod/discovery/ItunesTopListLoader.java
index bc9133258..79ccd9532 100644
--- a/app/src/main/java/de/danoeh/antennapod/discovery/ItunesTopListLoader.java
+++ b/app/src/main/java/de/danoeh/antennapod/discovery/ItunesTopListLoader.java
@@ -33,16 +33,12 @@ public class ItunesTopListLoader {
             OkHttpClient client = AntennapodHttpClient.getHttpClient();
             String feedString;
             try {
-                try {
-                    feedString = getTopListFeed(client, lang, limit);
-                } catch (IOException e) {
-                    feedString = getTopListFeed(client, "us", limit);
-                }
-                List<PodcastSearchResult> podcasts = parseFeed(feedString);
-                emitter.onSuccess(podcasts);
-            } catch (IOException | JSONException e) {
-                emitter.onError(e);
+                feedString = getTopListFeed(client, lang, limit);
+            } catch (IOException e) {
+                feedString = getTopListFeed(client, "us", limit);
             }
+            List<PodcastSearchResult> podcasts = parseFeed(feedString);
+            emitter.onSuccess(podcasts);
         })
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());