diff --git a/subsonic-api/build.gradle b/subsonic-api/build.gradle index 004778b0..4d6a0c05 100644 --- a/subsonic-api/build.gradle +++ b/subsonic-api/build.gradle @@ -12,7 +12,7 @@ sourceSets { dependencies { api other.kotlinStdlib api other.retrofit - implementation other.jacksonConverter + api other.jacksonConverter implementation(other.jacksonKotlin) { exclude module: 'kotlin-reflect' } diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/BackgroundTask.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/BackgroundTask.java index 20ccf443..4909a55b 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/BackgroundTask.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/BackgroundTask.java @@ -22,11 +22,11 @@ import android.app.Activity; import android.os.Handler; import android.util.Log; -import org.moire.ultrasonic.R; +import com.fasterxml.jackson.core.JsonParseException; +import org.moire.ultrasonic.R; import org.moire.ultrasonic.service.parser.SubsonicRESTException; import org.moire.ultrasonic.subsonic.RestErrorMapper; -import org.xmlpull.v1.XmlPullParserException; import java.io.FileNotFoundException; import java.io.IOException; @@ -82,16 +82,15 @@ public abstract class BackgroundTask implements ProgressListener return activity.getResources().getString(R.string.background_task_not_found); } - if (error instanceof IOException) + if (error instanceof JsonParseException) { + return activity.getResources().getString(R.string.background_task_parse_error); + } + + if (error instanceof IOException) { return activity.getResources().getString(R.string.background_task_network_error); } - if (error instanceof XmlPullParserException) - { - return activity.getResources().getString(R.string.background_task_parse_error); - } - if (error instanceof SubsonicRESTException) { return RestErrorMapper.getLocalizedErrorMessage((SubsonicRESTException) error, activity); }