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

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

Do not crash on undeliverable InterruptedException
This commit is contained in:
H. Lehmann 2019-08-30 13:44:13 +02:00 committed by GitHub
parent 17d6d7fbbf af8dc2c9b9
commit 46af0e0c36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/de/danoeh/antennapod/discovery/ItunesTopListLoader.java
View File

@ -33,16 +33,12 @@ public class ItunesTopListLoader {
OkHttpClient client = AntennapodHttpClient.getHttpClient(); OkHttpClient client = AntennapodHttpClient.getHttpClient();
String feedString; String feedString;
try { try {
try { feedString = getTopListFeed(client, lang, limit);
feedString = getTopListFeed(client, lang, limit); } catch (IOException e) {
} catch (IOException e) { feedString = getTopListFeed(client, "us", limit);
feedString = getTopListFeed(client, "us", limit);
}
List<PodcastSearchResult> podcasts = parseFeed(feedString);
emitter.onSuccess(podcasts);
} catch (IOException | JSONException e) {
emitter.onError(e);
} }
List<PodcastSearchResult> podcasts = parseFeed(feedString);
emitter.onSuccess(podcasts);
}) })
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()); .observeOn(AndroidSchedulers.mainThread());

3
core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java
View File

@ -34,7 +34,7 @@ public class ClientConfig {
private static boolean initialized = false; private static boolean initialized = false;
public static synchronized void initialize(Context context) { public static synchronized void initialize(Context context) {
if(initialized) { if (initialized) {
return; return;
} }
PodDBAdapter.init(context); PodDBAdapter.init(context);
@ -42,6 +42,7 @@ public class ClientConfig {
PlaybackPreferences.init(context); PlaybackPreferences.init(context);
NetworkUtils.init(context); NetworkUtils.init(context);
SleepTimerPreferences.init(context); SleepTimerPreferences.init(context);
RxJavaErrorHandlerSetup.setupRxJavaErrorHandler();
initialized = true; initialized = true;
} }

26
core/src/main/java/de/danoeh/antennapod/core/util/exception/RxJavaErrorHandlerSetup.java Normal file
View File

@ -0,0 +1,26 @@
package de.danoeh.antennapod.core.util.exception;
import android.util.Log;
import io.reactivex.exceptions.UndeliverableException;
import io.reactivex.plugins.RxJavaPlugins;
public class RxJavaErrorHandlerSetup {
private RxJavaErrorHandlerSetup() {
}
public static void setupRxJavaErrorHandler() {
RxJavaPlugins.setErrorHandler(e -> {
if (e instanceof UndeliverableException) {
e = e.getCause();
}
if (e instanceof InterruptedException) {
// fine, some blocking code was interrupted by a dispose call
Log.d("RxJavaErrorHandler", "Ignored exception: " + Log.getStackTraceString(e));
return;
}
Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
});
}
}

4
core/src/play/java/de/danoeh/antennapod/core/ClientConfig.java
View File

@ -8,6 +8,7 @@ import de.danoeh.antennapod.core.preferences.SleepTimerPreferences;
import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.preferences.UserPreferences;
import de.danoeh.antennapod.core.storage.PodDBAdapter; import de.danoeh.antennapod.core.storage.PodDBAdapter;
import de.danoeh.antennapod.core.util.NetworkUtils; import de.danoeh.antennapod.core.util.NetworkUtils;
import de.danoeh.antennapod.core.util.exception.RxJavaErrorHandlerSetup;
/** /**
* Stores callbacks for core classes like Services, DB classes etc. and other configuration variables. * Stores callbacks for core classes like Services, DB classes etc. and other configuration variables.
@ -36,7 +37,7 @@ public class ClientConfig {
private static boolean initialized = false; private static boolean initialized = false;
public static synchronized void initialize(Context context) { public static synchronized void initialize(Context context) {
if(initialized) { if (initialized) {
return; return;
} }
PodDBAdapter.init(context); PodDBAdapter.init(context);
@ -45,6 +46,7 @@ public class ClientConfig {
NetworkUtils.init(context); NetworkUtils.init(context);
CastManager.init(context); CastManager.init(context);
SleepTimerPreferences.init(context); SleepTimerPreferences.init(context);
RxJavaErrorHandlerSetup.setupRxJavaErrorHandler();
initialized = true; initialized = true;
} }