diff --git a/integration/cronet/src/main/AndroidManifest.xml b/integration/cronet/src/main/AndroidManifest.xml index e13bb2f8ae..5c2324a61a 100644 --- a/integration/cronet/src/main/AndroidManifest.xml +++ b/integration/cronet/src/main/AndroidManifest.xml @@ -1,8 +1,3 @@ - - - - + + diff --git a/integration/cronet/src/main/java/com/bumptech/glide/integration/cronet/CronetEngineSingleton.java b/integration/cronet/src/main/java/com/bumptech/glide/integration/cronet/CronetEngineSingleton.java deleted file mode 100644 index 9c926342e0..0000000000 --- a/integration/cronet/src/main/java/com/bumptech/glide/integration/cronet/CronetEngineSingleton.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.bumptech.glide.integration.cronet; - -import android.content.Context; -import org.chromium.net.CronetEngine; - -/** - * Class controlling singleton instance of the CronetEngine. Ensures at most one instance of the - * CronetEngine is created. - */ -// NOTE: This is a standalone class and not a memoized supplier as the CronetEngine creations -// requires a parameter, namedly a Context reference. -public final class CronetEngineSingleton { - - // non instantiable - private CronetEngineSingleton() {} - - private static volatile CronetEngine cronetEngineSingleton; - - public static CronetEngine getSingleton(Context context) { - - // Lazily create the engine. - if (cronetEngineSingleton == null) { - synchronized (CronetEngineSingleton.class) { - // have to re-check since this might have changed before synchronization, but we don't - // want to synchronize just to check for null. - if (cronetEngineSingleton == null) { - cronetEngineSingleton = createEngine(context); - } - } - } - - return cronetEngineSingleton; - } - - private static CronetEngine createEngine(Context context) { - return new CronetEngine.Builder(context) - .enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISABLED, 0) - .enableHttp2(true) - .enableQuic(false) - .build(); - } -} diff --git a/integration/cronet/src/main/java/com/bumptech/glide/integration/cronet/CronetGlideModule.java b/integration/cronet/src/main/java/com/bumptech/glide/integration/cronet/CronetGlideModule.java deleted file mode 100644 index 66f28301cc..0000000000 --- a/integration/cronet/src/main/java/com/bumptech/glide/integration/cronet/CronetGlideModule.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.bumptech.glide.integration.cronet; - -import android.content.Context; -import com.bumptech.glide.Glide; -import com.bumptech.glide.GlideBuilder; -import com.bumptech.glide.Registry; -import com.bumptech.glide.load.model.GlideUrl; -import com.bumptech.glide.module.GlideModule; -import com.google.common.base.Supplier; -import java.io.InputStream; -import java.nio.ByteBuffer; -import org.chromium.net.CronetEngine; - -/** - * A {@link GlideModule} that registers components allowing remote image fetching to be done using - * Cronet. - */ -public final class CronetGlideModule implements GlideModule { - - @Override - public void applyOptions(Context context, GlideBuilder builder) {} - - @Override - public void registerComponents(final Context context, Glide glide, Registry registry) { - CronetRequestFactory factory = - new CronetRequestFactoryImpl( - new Supplier() { - @Override - public CronetEngine get() { - return CronetEngineSingleton.getSingleton(context); - } - }); - registry.replace( - GlideUrl.class, InputStream.class, new ChromiumUrlLoader.StreamFactory(factory, null)); - registry.prepend( - GlideUrl.class, ByteBuffer.class, new ChromiumUrlLoader.ByteBufferFactory(factory, null)); - } -} diff --git a/integration/cronet/src/main/java/com/bumptech/glide/integration/cronet/CronetLibraryGlideModule.java b/integration/cronet/src/main/java/com/bumptech/glide/integration/cronet/CronetLibraryGlideModule.java deleted file mode 100644 index 93e1069576..0000000000 --- a/integration/cronet/src/main/java/com/bumptech/glide/integration/cronet/CronetLibraryGlideModule.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.bumptech.glide.integration.cronet; - -import android.content.Context; -import androidx.annotation.NonNull; -import com.bumptech.glide.Glide; -import com.bumptech.glide.Registry; -import com.bumptech.glide.annotation.GlideModule; -import com.bumptech.glide.integration.cronet.ChromiumUrlLoader.ByteBufferFactory; -import com.bumptech.glide.integration.cronet.ChromiumUrlLoader.StreamFactory; -import com.bumptech.glide.load.model.GlideUrl; -import com.bumptech.glide.module.LibraryGlideModule; -import com.google.common.base.Supplier; -import java.io.InputStream; -import java.nio.ByteBuffer; -import org.chromium.net.CronetEngine; - -/** - * A {@link LibraryGlideModule} that registers components allowing remote image fetching to be done - * using Cronet. - */ -@GlideModule -public final class CronetLibraryGlideModule extends LibraryGlideModule { - - @Override - public void registerComponents( - final @NonNull Context context, @NonNull Glide glide, @NonNull Registry registry) { - CronetRequestFactory factory = - new CronetRequestFactoryImpl( - new Supplier() { - @Override - public CronetEngine get() { - return CronetEngineSingleton.getSingleton(context); - } - }); - registry.replace( - GlideUrl.class, InputStream.class, new StreamFactory(factory, null /* dataLogger */)); - registry.prepend( - GlideUrl.class, ByteBuffer.class, new ByteBufferFactory(factory, null /* dataLogger */)); - } -}