android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-11-29 06:23:09 +03:00
Code Releases Activity

Refactor towards an OkHttpClient.Builder.

Browse Source 
Still some work to do on method naming, but this was the interesting part.
Also very much need to rename OkUrlFactory in tests to urlFactory, otherwise
the client.client stuff becomes madness.
This commit is contained in:
jwilson
2015-12-31 02:31:17 -05:00
parent db9c2db40b
commit f2461183e8
63 changed files with 1391 additions and 1069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
okhttp-android-support/src/main/java/okhttp3/AndroidInternal.java
View File

@@ -30,15 +30,16 @@ public class AndroidInternal {
/** Sets the response cache to be used to read and write cached responses. */
public static void setResponseCache(OkUrlFactory okUrlFactory, ResponseCache responseCache) {
OkHttpClient client = okUrlFactory.client();
OkHttpClient.Builder builder = okUrlFactory.client().newBuilder();
if (responseCache instanceof OkCacheContainer) {
// Avoid adding layers of wrappers. Rather than wrap the ResponseCache in yet another layer to
// make the ResponseCache look like an InternalCache, we can unwrap the Cache instead.
// This means that Cache stats will be correctly updated.
OkCacheContainer okCacheContainer = (OkCacheContainer) responseCache;
client.setCache(okCacheContainer.getCache());
builder.setCache(okCacheContainer.getCache());
} else {
client.setInternalCache(responseCache != null ? new CacheAdapter(responseCache) : null);
builder.setInternalCache(responseCache != null ? new CacheAdapter(responseCache) : null);
}
okUrlFactory.setClient(builder.build());
}
}