tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up

Browse source
This commit is contained in:
Karim Abou Zeid 2016-01-04 18:35:55 +01:00
commit 6fb17d7b55
2 changed files with 6 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageLoader.java
View file

@ -19,48 +19,32 @@ import java.io.InputStream;
public class ArtistImageLoader implements StreamModelLoader<ArtistImage> { public class ArtistImageLoader implements StreamModelLoader<ArtistImage> {
private Context context; private Context context;
private LastFMRestClient lastFMRestClient; private LastFMRestClient lastFMClient;
private ModelLoader<GlideUrl, InputStream> urlLoader; private ModelLoader<GlideUrl, InputStream> urlLoader;
public ArtistImageLoader(Context context, LastFMRestClient lastFMRestClient, ModelLoader<GlideUrl, InputStream> urlLoader) { public ArtistImageLoader(Context context, LastFMRestClient lastFMRestClient, ModelLoader<GlideUrl, InputStream> urlLoader) {
this.context = context; this.context = context;
this.lastFMRestClient = lastFMRestClient; this.lastFMClient = lastFMRestClient;
this.urlLoader = urlLoader; this.urlLoader = urlLoader;
} }
@Override @Override
public DataFetcher<InputStream> getResourceFetcher(ArtistImage model, int width, int height) { public DataFetcher<InputStream> getResourceFetcher(ArtistImage model, int width, int height) {
return new ArtistImageFetcher(context, lastFMRestClient, model, urlLoader, width, height); return new ArtistImageFetcher(context, lastFMClient, model, urlLoader, width, height);
} }
public static class Factory implements ModelLoaderFactory<ArtistImage, InputStream> { public static class Factory implements ModelLoaderFactory<ArtistImage, InputStream> {
private static volatile LastFMRestClient internalClient; private LastFMRestClient lastFMClient;
private LastFMRestClient client;
private OkHttpUrlLoader.Factory okHttpFactory; private OkHttpUrlLoader.Factory okHttpFactory;
private static LastFMRestClient getInternalClient(Context context) {
if (internalClient == null) {
synchronized (Factory.class) {
if (internalClient == null) {
internalClient = new LastFMRestClient(context);
}
}
}
return internalClient;
}
/**
* Constructor for a new Factory that runs requests using a static singleton client.
*/
public Factory(Context context) { public Factory(Context context) {
client = getInternalClient(context);
okHttpFactory = new OkHttpUrlLoader.Factory(); okHttpFactory = new OkHttpUrlLoader.Factory();
lastFMClient = new LastFMRestClient(context);
} }
@Override @Override
public ModelLoader<ArtistImage, InputStream> build(Context context, GenericLoaderFactory factories) { public ModelLoader<ArtistImage, InputStream> build(Context context, GenericLoaderFactory factories) {
return new ArtistImageLoader(context, client, okHttpFactory.build(context, factories)); return new ArtistImageLoader(context, lastFMClient, okHttpFactory.build(context, factories));
} }
@Override @Override

4
app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java
View file

@ -12,7 +12,6 @@ import com.squareup.okhttp.Response;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.TimeUnit;
import retrofit.GsonConverterFactory; import retrofit.GsonConverterFactory;
import retrofit.Retrofit; import retrofit.Retrofit;
@ -33,9 +32,6 @@ public class LastFMRestClient {
okHttpClient.setCache(new Cache(cacheDir, 1024 * 1024 * 10)); okHttpClient.setCache(new Cache(cacheDir, 1024 * 1024 * 10));
} }
okHttpClient.setConnectTimeout(15, TimeUnit.SECONDS);
okHttpClient.setReadTimeout(20, TimeUnit.SECONDS);
okHttpClient.interceptors().add(new Interceptor() { okHttpClient.interceptors().add(new Interceptor() {
@Override @Override
public Response intercept(Chain chain) throws IOException { public Response intercept(Chain chain) throws IOException {