diff --git a/library/src/main/java/com/bumptech/glide/GlideBuilder.java b/library/src/main/java/com/bumptech/glide/GlideBuilder.java index 48c67bd9a59f689ae5cbac54be959b5d371036f2..45cd6ac8f9b68b57e8c7db2d57df376ca5422df1 100644 --- a/library/src/main/java/com/bumptech/glide/GlideBuilder.java +++ b/library/src/main/java/com/bumptech/glide/GlideBuilder.java @@ -27,7 +27,7 @@ public class GlideBuilder { private BitmapPool bitmapPool; private MemoryCache memoryCache; private DiskCache diskCache; - private ExecutorService resizeService; + private ExecutorService sourceService; private ExecutorService diskCacheService; public GlideBuilder(Context context) { @@ -86,7 +86,7 @@ public class GlideBuilder { * @return This builder. */ public GlideBuilder setResizeService(ExecutorService service) { - this.resizeService = service; + this.sourceService = service; return this; } @@ -117,9 +117,9 @@ public class GlideBuilder { } Glide createGlide() { - if (resizeService == null) { + if (sourceService == null) { final int cores = Math.max(1, Runtime.getRuntime().availableProcessors()); - resizeService = new FifoPriorityThreadPoolExecutor(cores); + sourceService = new FifoPriorityThreadPoolExecutor(cores); } if (diskCacheService == null) { diskCacheService = new FifoPriorityThreadPoolExecutor(1); @@ -149,7 +149,7 @@ public class GlideBuilder { } if (engine == null) { - engine = new Engine(memoryCache, diskCache, resizeService, diskCacheService); + engine = new Engine(memoryCache, diskCache, diskCacheService, sourceService); } return new Glide(engine, memoryCache, bitmapPool, context); diff --git a/library/src/main/java/com/bumptech/glide/load/engine/Engine.java b/library/src/main/java/com/bumptech/glide/load/engine/Engine.java index d6fe46899a732c74107b96e078faee5fdf111add..822e6d321a7589b2cca120e4edb82847eeaf2092 100644 --- a/library/src/main/java/com/bumptech/glide/load/engine/Engine.java +++ b/library/src/main/java/com/bumptech/glide/load/engine/Engine.java @@ -54,14 +54,14 @@ public class Engine implements EngineJobListener, MemoryCache.ResourceRemovedLis } } - public Engine(MemoryCache memoryCache, DiskCache diskCache, ExecutorService resizeService, - ExecutorService diskCacheService) { - this(memoryCache, diskCache, resizeService, diskCacheService, null, null, null, null); + public Engine(MemoryCache memoryCache, DiskCache diskCache, ExecutorService diskCacheService, + ExecutorService sourceService) { + this(memoryCache, diskCache, diskCacheService, sourceService, null, null, null, null); } // Visible for testing. - Engine(MemoryCache cache, DiskCache diskCache, ExecutorService resizeService, - ExecutorService diskCacheService, Map jobs, EngineKeyFactory keyFactory, + Engine(MemoryCache cache, DiskCache diskCache, ExecutorService diskCacheService, ExecutorService sourceService, + Map jobs, EngineKeyFactory keyFactory, Map>> activeResources, EngineJobFactory engineJobFactory) { this.cache = cache; this.diskCache = diskCache; @@ -82,7 +82,7 @@ public class Engine implements EngineJobListener, MemoryCache.ResourceRemovedLis this.jobs = jobs; if (engineJobFactory == null) { - engineJobFactory = new EngineJobFactory(diskCacheService, resizeService, this); + engineJobFactory = new EngineJobFactory(diskCacheService, sourceService, this); } this.engineJobFactory = engineJobFactory; @@ -307,18 +307,18 @@ public class Engine implements EngineJobListener, MemoryCache.ResourceRemovedLis // Visible for testing. static class EngineJobFactory { private final ExecutorService diskCacheService; - private final ExecutorService resizeService; + private final ExecutorService sourceService; private final EngineJobListener listener; - public EngineJobFactory(ExecutorService diskCacheService, ExecutorService resizeService, + public EngineJobFactory(ExecutorService diskCacheService, ExecutorService sourceService, EngineJobListener listener) { this.diskCacheService = diskCacheService; - this.resizeService = resizeService; + this.sourceService = sourceService; this.listener = listener; } public EngineJob build(Key key, boolean isMemoryCacheable) { - return new EngineJob(key, diskCacheService, resizeService, isMemoryCacheable, listener); + return new EngineJob(key, diskCacheService, sourceService, isMemoryCacheable, listener); } } } diff --git a/library/src/main/java/com/bumptech/glide/load/engine/EngineJob.java b/library/src/main/java/com/bumptech/glide/load/engine/EngineJob.java index 087eea89f47b6f9aac9dda51f98e97860ef6c46b..ef9ffcacc8417ac9d5e4566bf42f8a12aa0403e2 100644 --- a/library/src/main/java/com/bumptech/glide/load/engine/EngineJob.java +++ b/library/src/main/java/com/bumptech/glide/load/engine/EngineJob.java @@ -46,7 +46,6 @@ class EngineJob implements EngineRunnable.EngineRunnableManager { private volatile Future future; - public EngineJob(Key key, ExecutorService diskCacheService, ExecutorService sourceService, boolean isCacheable, EngineJobListener listener) { this(key, diskCacheService, sourceService, isCacheable, listener, DEFAULT_FACTORY);