From b6e633762d1a1b3692f6f20d8723f7c4aff97361 Mon Sep 17 00:00:00 2001 From: dkanada Date: Wed, 6 May 2020 14:46:08 +0900 Subject: [PATCH] simplify glide requests --- app/src/main/AndroidManifest.xml | 3 -- .../gramophone/glide/CustomGlideModule.java | 22 -------- .../glide/audiocover/AudioFileCover.java | 18 ------- .../audiocover/AudioFileCoverFetcher.java | 51 ------------------- .../audiocover/AudioFileCoverLoader.java | 30 ----------- 5 files changed, 124 deletions(-) delete mode 100644 app/src/main/java/com/kabouzeid/gramophone/glide/CustomGlideModule.java delete mode 100644 app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCover.java delete mode 100644 app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java delete mode 100644 app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverLoader.java diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7d1adc2c..99b49f40 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -78,9 +78,6 @@ - diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/CustomGlideModule.java b/app/src/main/java/com/kabouzeid/gramophone/glide/CustomGlideModule.java deleted file mode 100644 index d11f2072..00000000 --- a/app/src/main/java/com/kabouzeid/gramophone/glide/CustomGlideModule.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.kabouzeid.gramophone.glide; - -import android.content.Context; - -import java.io.InputStream; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.GlideBuilder; -import com.bumptech.glide.module.GlideModule; -import com.kabouzeid.gramophone.glide.audiocover.AudioFileCover; -import com.kabouzeid.gramophone.glide.audiocover.AudioFileCoverLoader; - -public class CustomGlideModule implements GlideModule { - @Override - public void applyOptions(Context context, GlideBuilder builder) { - } - - @Override - public void registerComponents(Context context, Glide glide) { - glide.register(AudioFileCover.class, InputStream.class, new AudioFileCoverLoader.Factory()); - } -} diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCover.java b/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCover.java deleted file mode 100644 index a08af0c9..00000000 --- a/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCover.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.kabouzeid.gramophone.glide.audiocover; - -import com.kabouzeid.gramophone.App; - -import org.jellyfin.apiclient.model.dto.ImageOptions; -import org.jellyfin.apiclient.model.entities.ImageType; - -public class AudioFileCover { - public String location; - - public AudioFileCover(String item) { - ImageOptions options = new ImageOptions(); - options.setImageType(ImageType.Primary); - options.setMaxHeight(800); - - this.location = App.getApiClient().GetImageUrl(item, options); - } -} diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java b/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java deleted file mode 100644 index a52374f1..00000000 --- a/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.kabouzeid.gramophone.glide.audiocover; - -import java.io.IOException; -import java.io.InputStream; - -import com.bumptech.glide.Priority; -import com.bumptech.glide.load.data.DataFetcher; -import com.bumptech.glide.load.data.HttpUrlFetcher; -import com.bumptech.glide.load.model.GlideUrl; - -public class AudioFileCoverFetcher implements DataFetcher { - private final AudioFileCover model; - - private InputStream stream; - - public AudioFileCoverFetcher(AudioFileCover model) { - this.model = model; - } - - @Override - public String getId() { - // make sure we never return null here - return String.valueOf(model.location); - } - - @Override - public InputStream loadData(final Priority priority) throws Exception { - final GlideUrl url = new GlideUrl(String.valueOf(model.location)); - final HttpUrlFetcher retriever = new HttpUrlFetcher(url); - - stream = retriever.loadData(Priority.NORMAL); - return stream; - } - - @Override - public void cleanup() { - // already cleaned up in loadData - if (stream != null) { - try { - stream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - @Override - public void cancel() { - // cannot cancel - } -} diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverLoader.java b/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverLoader.java deleted file mode 100644 index ab39dbea..00000000 --- a/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverLoader.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.kabouzeid.gramophone.glide.audiocover; - -import android.content.Context; - -import com.bumptech.glide.load.data.DataFetcher; -import com.bumptech.glide.load.model.GenericLoaderFactory; -import com.bumptech.glide.load.model.ModelLoader; -import com.bumptech.glide.load.model.ModelLoaderFactory; -import com.bumptech.glide.load.model.stream.StreamModelLoader; - -import java.io.InputStream; - -public class AudioFileCoverLoader implements StreamModelLoader { - - @Override - public DataFetcher getResourceFetcher(AudioFileCover model, int width, int height) { - return new AudioFileCoverFetcher(model); - } - - public static class Factory implements ModelLoaderFactory { - @Override - public ModelLoader build(Context context, GenericLoaderFactory factories) { - return new AudioFileCoverLoader(); - } - - @Override - public void teardown() { - } - } -}