Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6166 from ByteHamster/less-noisy-glide

Browse Source 
Do not print stacktrace for image loading errors
This commit is contained in:
ByteHamster 2022-10-29 11:54:50 +02:00 committed by GitHub
commit e260056f08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java
View File

@ -32,6 +32,7 @@ public class ApGlideModule extends AppGlideModule {
@Override @Override
public void applyOptions(@NonNull Context context, @NonNull GlideBuilder builder) { public void applyOptions(@NonNull Context context, @NonNull GlideBuilder builder) {
builder.setDefaultRequestOptions(RequestOptions.formatOf(DecodeFormat.PREFER_ARGB_8888)); builder.setDefaultRequestOptions(RequestOptions.formatOf(DecodeFormat.PREFER_ARGB_8888));
builder.setLogLevel(Log.WARN);
@SuppressLint("UsableSpace") @SuppressLint("UsableSpace")
long spaceAvailable = context.getCacheDir().getUsableSpace(); long spaceAvailable = context.getCacheDir().getUsableSpace();
long imageCacheSize = (spaceAvailable > 2 * GIGABYTES) ? (250 * MEGABYTES) : (50 * MEGABYTES); long imageCacheSize = (spaceAvailable > 2 * GIGABYTES) ? (250 * MEGABYTES) : (50 * MEGABYTES);

7
core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
View File

@ -12,6 +12,8 @@ import com.bumptech.glide.load.model.MultiModelLoaderFactory;
import com.bumptech.glide.signature.ObjectKey; import com.bumptech.glide.signature.ObjectKey;
import de.danoeh.antennapod.core.service.download.AntennapodHttpClient; import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
import de.danoeh.antennapod.core.util.NetworkUtils; import de.danoeh.antennapod.core.util.NetworkUtils;
import de.danoeh.antennapod.model.feed.Feed;
import de.danoeh.antennapod.model.feed.FeedMedia;
import okhttp3.Interceptor; import okhttp3.Interceptor;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Protocol; import okhttp3.Protocol;
@ -81,8 +83,11 @@ class ApOkHttpUrlLoader implements ModelLoader<String, InputStream> {
@Override @Override
public boolean handles(@NonNull String model) { public boolean handles(@NonNull String model) {
// Leave content URIs to Glide's default loaders
return !TextUtils.isEmpty(model) return !TextUtils.isEmpty(model)
// If the other loaders fail, do not attempt to load as web resource
&& !model.startsWith(Feed.PREFIX_GENERATIVE_COVER)
&& !model.startsWith(FeedMedia.FILENAME_PREFIX_EMBEDDED_COVER)
// Leave content URIs to Glide's default loaders
&& !model.startsWith(ContentResolver.SCHEME_CONTENT) && !model.startsWith(ContentResolver.SCHEME_CONTENT)
&& !model.startsWith(ContentResolver.SCHEME_ANDROID_RESOURCE); && !model.startsWith(ContentResolver.SCHEME_ANDROID_RESOURCE);
} }

10
core/src/main/java/de/danoeh/antennapod/core/glide/AudioCoverFetcher.java
View File

@ -11,7 +11,6 @@ import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.data.DataFetcher; import com.bumptech.glide.load.data.DataFetcher;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
// see https://github.com/bumptech/glide/issues/699 // see https://github.com/bumptech/glide/issues/699
@ -26,8 +25,7 @@ class AudioCoverFetcher implements DataFetcher<InputStream> {
@Override @Override
public void loadData(@NonNull Priority priority, @NonNull DataCallback<? super InputStream> callback) { public void loadData(@NonNull Priority priority, @NonNull DataCallback<? super InputStream> callback) {
MediaMetadataRetriever retriever = new MediaMetadataRetriever(); try (MediaMetadataRetriever retriever = new MediaMetadataRetriever()) {
try {
if (path.startsWith(ContentResolver.SCHEME_CONTENT)) { if (path.startsWith(ContentResolver.SCHEME_CONTENT)) {
retriever.setDataSource(context, Uri.parse(path)); retriever.setDataSource(context, Uri.parse(path));
} else { } else {
@ -36,12 +34,10 @@ class AudioCoverFetcher implements DataFetcher<InputStream> {
byte[] picture = retriever.getEmbeddedPicture(); byte[] picture = retriever.getEmbeddedPicture();
if (picture != null) { if (picture != null) {
callback.onDataReady(new ByteArrayInputStream(picture)); callback.onDataReady(new ByteArrayInputStream(picture));
return;
} }
} finally { } catch (Exception e) {
retriever.release(); callback.onLoadFailed(e);
} }
callback.onLoadFailed(new IOException("Loading embedded cover did not work"));
} }
@Override public void cleanup() { @Override public void cleanup() {

8
core/src/main/java/de/danoeh/antennapod/core/glide/NoHttpStringLoader.java
View File

@ -6,6 +6,8 @@ import com.bumptech.glide.load.model.ModelLoader;
import com.bumptech.glide.load.model.ModelLoaderFactory; import com.bumptech.glide.load.model.ModelLoaderFactory;
import com.bumptech.glide.load.model.MultiModelLoaderFactory; import com.bumptech.glide.load.model.MultiModelLoaderFactory;
import com.bumptech.glide.load.model.StringLoader; import com.bumptech.glide.load.model.StringLoader;
import de.danoeh.antennapod.model.feed.Feed;
import de.danoeh.antennapod.model.feed.FeedMedia;
import java.io.InputStream; import java.io.InputStream;
@ -34,6 +36,10 @@ public final class NoHttpStringLoader extends StringLoader<InputStream> {
@Override @Override
public boolean handles(@NonNull String model) { public boolean handles(@NonNull String model) {
return !model.startsWith("http") && super.handles(model); return !model.startsWith("http")
// If the custom loaders fail, do not attempt to load with Glide internal loaders
&& !model.startsWith(Feed.PREFIX_GENERATIVE_COVER)
&& !model.startsWith(FeedMedia.FILENAME_PREFIX_EMBEDDED_COVER)
&& super.handles(model);
} }
} }