Skip to content

Commit

Permalink
Use the application Context to build ModelLoaders.
Browse files Browse the repository at this point in the history
Fixes #210
  • Loading branch information
sjudd committed Oct 22, 2014
1 parent 4fcb6cd commit 1c213bd
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 17 deletions.
5 changes: 3 additions & 2 deletions library/src/main/java/com/bumptech/glide/Glide.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public class Glide {
private static final String TAG = "Glide";
private static volatile Glide glide;

private final GenericLoaderFactory loaderFactory = new GenericLoaderFactory();
private final GenericLoaderFactory loaderFactory;
private final Engine engine;
private final BitmapPool bitmapPool;
private final MemoryCache memoryCache;
Expand Down Expand Up @@ -188,6 +188,7 @@ static void tearDown() {
this.bitmapPool = bitmapPool;
this.memoryCache = memoryCache;
this.decodeFormat = decodeFormat;
loaderFactory = new GenericLoaderFactory(context);
mainHandler = new Handler(Looper.getMainLooper());
bitmapPreFiller = new BitmapPreFiller(memoryCache, bitmapPool);

Expand Down Expand Up @@ -492,7 +493,7 @@ public static <T, Y> ModelLoader<T, Y> buildModelLoader(Class<T> modelClass, Cla
}
return null;
}
return Glide.get(context).getLoaderFactory().buildModelLoader(modelClass, resourceClass, context);
return Glide.get(context).getLoaderFactory().buildModelLoader(modelClass, resourceClass);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public RequestManager(Context context, Lifecycle lifecycle) {

RequestManager(Context context, final Lifecycle lifecycle, RequestTracker requestTracker,
ConnectivityMonitorFactory factory) {
this.context = context;
this.context = context.getApplicationContext();
this.lifecycle = lifecycle;
this.requestTracker = requestTracker;
this.glide = Glide.get(context);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ public String toString() {
}
};

private final Context context;

public GenericLoaderFactory(Context context) {
this.context = context.getApplicationContext();
}

/**
* Removes and returns the registered {@link ModelLoaderFactory} for the given model and resource classes. Returns
* null if no such factory is registered. Clears all cached model loaders.
Expand Down Expand Up @@ -92,13 +98,30 @@ public synchronized <T, Y> ModelLoaderFactory<T, Y> register(Class<T> modelClass
* {@link ModelLoader} or building a new a new {@link ModelLoader} using registered {@link ModelLoaderFactory}s.
* Returns null if no {@link ModelLoaderFactory} is registered for the given classes.
*
* @deprecated Use {@link #buildModelLoader(Class, Class)} instead.
* @param modelClass The model class.
* @param resourceClass The resource class.
* @param context Unused
* @param <T> The type of the model.
* @param <Y> The type of the resource.
*/
@Deprecated
public synchronized <T, Y> ModelLoader<T, Y> buildModelLoader(Class<T> modelClass, Class<Y> resourceClass,
Context context) {
Context context) {
return buildModelLoader(modelClass, resourceClass);
}

/**
* Returns a {@link ModelLoader} for the given model and resource classes by either returning a cached
* {@link ModelLoader} or building a new a new {@link ModelLoader} using registered {@link ModelLoaderFactory}s.
* Returns null if no {@link ModelLoaderFactory} is registered for the given classes.
*
* @param modelClass The model class.
* @param resourceClass The resource class.
* @param <T> The type of the model.
* @param <Y> The type of the resource.
*/
public synchronized <T, Y> ModelLoader<T, Y> buildModelLoader(Class<T> modelClass, Class<Y> resourceClass) {
ModelLoader<T, Y> result = getCachedLoader(modelClass, resourceClass);
if (result != null) {
// We've already tried to create a model loader and can't with the currently registered set of factories,
Expand Down Expand Up @@ -152,7 +175,6 @@ private <T, Y> ModelLoaderFactory<T, Y> getFactory(Class<T> modelClass, Class<Y>
result = resourceToFactories.get(resourceClass);
}


if (result == null) {
for (Class<? super T> registeredModelClass : modelClassToResourceFactories.keySet()) {
// This accounts for model subclasses, our map only works for exact matches. We should however still
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ public class FileDescriptorFileLoader extends FileLoader<ParcelFileDescriptor>
public static class Factory implements ModelLoaderFactory<File, ParcelFileDescriptor> {
@Override
public ModelLoader<File, ParcelFileDescriptor> build(Context context, GenericLoaderFactory factories) {
return new FileDescriptorFileLoader(factories.buildModelLoader(Uri.class, ParcelFileDescriptor.class,
context));
return new FileDescriptorFileLoader(factories.buildModelLoader(Uri.class, ParcelFileDescriptor.class));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static class Factory implements ModelLoaderFactory<Integer, ParcelFileDes
@Override
public ModelLoader<Integer, ParcelFileDescriptor> build(Context context, GenericLoaderFactory factories) {
return new FileDescriptorResourceLoader(context, factories.buildModelLoader(Uri.class,
ParcelFileDescriptor.class, context));
ParcelFileDescriptor.class));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ public class FileDescriptorStringLoader extends StringLoader<ParcelFileDescripto
public static class Factory implements ModelLoaderFactory<String, ParcelFileDescriptor> {
@Override
public ModelLoader<String, ParcelFileDescriptor> build(Context context, GenericLoaderFactory factories) {
return new FileDescriptorStringLoader(factories.buildModelLoader(Uri.class, ParcelFileDescriptor.class,
context));
return new FileDescriptorStringLoader(factories.buildModelLoader(Uri.class, ParcelFileDescriptor.class));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static class Factory implements ModelLoaderFactory<Uri, ParcelFileDescrip
@Override
public ModelLoader<Uri, ParcelFileDescriptor> build(Context context, GenericLoaderFactory factories) {
return new FileDescriptorUriLoader(context, factories.buildModelLoader(GlideUrl.class,
ParcelFileDescriptor.class, context));
ParcelFileDescriptor.class));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class StreamFileLoader extends FileLoader<InputStream> implements StreamM
public static class Factory implements ModelLoaderFactory<File, InputStream> {
@Override
public ModelLoader<File, InputStream> build(Context context, GenericLoaderFactory factories) {
return new StreamFileLoader(factories.buildModelLoader(Uri.class, InputStream.class, context));
return new StreamFileLoader(factories.buildModelLoader(Uri.class, InputStream.class));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static class Factory implements ModelLoaderFactory<Integer, InputStream>

@Override
public ModelLoader<Integer, InputStream> build(Context context, GenericLoaderFactory factories) {
return new StreamResourceLoader(context, factories.buildModelLoader(Uri.class, InputStream.class, context));
return new StreamResourceLoader(context, factories.buildModelLoader(Uri.class, InputStream.class));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class StreamStringLoader extends StringLoader<InputStream> implements Str
public static class Factory implements ModelLoaderFactory<String, InputStream> {
@Override
public ModelLoader<String, InputStream> build(Context context, GenericLoaderFactory factories) {
return new StreamStringLoader(factories.buildModelLoader(Uri.class, InputStream.class, context));
return new StreamStringLoader(factories.buildModelLoader(Uri.class, InputStream.class));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static class Factory implements ModelLoaderFactory<Uri, InputStream> {

@Override
public ModelLoader<Uri, InputStream> build(Context context, GenericLoaderFactory factories) {
return new StreamUriLoader(context, factories.buildModelLoader(GlideUrl.class, InputStream.class, context));
return new StreamUriLoader(context, factories.buildModelLoader(GlideUrl.class, InputStream.class));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class StreamUrlLoader extends UrlLoader<InputStream> {
public static class Factory implements ModelLoaderFactory<URL, InputStream> {
@Override
public ModelLoader<URL, InputStream> build(Context context, GenericLoaderFactory factories) {
return new StreamUrlLoader(factories.buildModelLoader(GlideUrl.class, InputStream.class, context));
return new StreamUrlLoader(factories.buildModelLoader(GlideUrl.class, InputStream.class));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ private void init(
this.loadProvider = loadProvider;
this.model = model;
this.signature = signature;
this.context = context;
this.context = context.getApplicationContext();
this.priority = priority;
this.target = target;
this.sizeMultiplier = sizeMultiplier;
Expand Down

0 comments on commit 1c213bd

Please sign in to comment.