More native OkHttp API tweaks.

Author: JakeWharton

picasso/src/main/java/com/squareup/picasso/OkHttpDownloader.java

@@ -29,6 +29,7 @@ private static OkHttpClient defaultOkHttpClient() {
     OkHttpClient client = new OkHttpClient();
     client.setConnectTimeout(Utils.DEFAULT_CONNECT_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
     client.setReadTimeout(Utils.DEFAULT_READ_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+    client.setWriteTimeout(Utils.DEFAULT_WRITE_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
     return client;
   }
 
@@ -94,7 +95,7 @@ protected final OkHttpClient getClient() {
         new com.squareup.okhttp.Request.Builder().url(uri.toString());
 
     if (localCacheOnly) {
-      requestBuilder.addHeader("Cache-Control", "only-if-cached,max-age=" + Integer.MAX_VALUE);
+      requestBuilder.addHeader("Cache-Control", "only-if-cached,max-age=2147483647");
     }
 
     com.squareup.okhttp.Response response = client.newCall(requestBuilder.build()).execute();

picasso/src/main/java/com/squareup/picasso/Utils.java

@@ -49,6 +49,7 @@ final class Utils {
   static final String THREAD_PREFIX = "Picasso-";
   static final String THREAD_IDLE_NAME = THREAD_PREFIX + "Idle";
   static final int DEFAULT_READ_TIMEOUT_MILLIS = 20 * 1000; // 20s
+  static final int DEFAULT_WRITE_TIMEOUT_MILLIS = 20 * 1000; // 20s
   static final int DEFAULT_CONNECT_TIMEOUT_MILLIS = 15 * 1000; // 15s
   private static final String PICASSO_CACHE = "picasso-cache";
   private static final int KEY_PADDING = 50; // Determined by exact science.

picasso/src/test/java/com/squareup/picasso/OkHttpDownloaderTest.java

@@ -46,7 +46,7 @@ public class OkHttpDownloaderTest {
     uri = Uri.parse(server.getUrl("/").toString());
   }
 
-  @Test public void responseSourceHeaderSetsResponseValue() throws Exception {
+  @Test public void cachedResponse() throws Exception {
     server.enqueue(new MockResponse()
         .setHeader("Cache-Control", "max-age=31536000")
         .setBody("Hi"));
@@ -60,6 +60,21 @@ public class OkHttpDownloaderTest {
     assertThat(response2.cached).isTrue();
   }
 
+  @Test public void offlineStaleResponse() throws Exception {
+    server.enqueue(new MockResponse()
+        .setHeader("Cache-Control", "max-age=1")
+        .setHeader("Expires", "Mon, 29 Dec 2014 21:44:55 GMT")
+        .setBody("Hi"));
+
+    Downloader.Response response1 = downloader.load(uri, false);
+    assertThat(response1.cached).isFalse();
+    // Exhaust input stream to ensure response is cached.
+    Okio.buffer(Okio.source(response1.getInputStream())).readByteArray();
+
+    Downloader.Response response2 = downloader.load(uri, true);
+    assertThat(response2.cached).isTrue();
+  }
+
   @Test public void readsContentLengthHeader() throws Exception {
     server.enqueue(new MockResponse().addHeader("Content-Length", 1024));