From 82462cd0a0d7fa58d5497c39534380ad3987fdd1 Mon Sep 17 00:00:00 2001 From: Tom Ye Date: Wed, 10 Jun 2015 17:35:04 -0700 Subject: Make default timeout/retry/multiplier values public Change-Id: Ia5681e2876999f75cea3e4f5f9ef223a06787d4e (cherry picked from commit 5d563ac2fab08f5e066c6fd6bbf012314be0bf8d) --- .../com/android/volley/toolbox/ImageRequest.java | 22 +++++++++++----------- .../android/volley/toolbox/ImageRequestTest.java | 4 ++++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/android/volley/toolbox/ImageRequest.java b/src/main/java/com/android/volley/toolbox/ImageRequest.java index 27c1fe2..d663f5f 100644 --- a/src/main/java/com/android/volley/toolbox/ImageRequest.java +++ b/src/main/java/com/android/volley/toolbox/ImageRequest.java @@ -16,6 +16,11 @@ package com.android.volley.toolbox; +import android.graphics.Bitmap; +import android.graphics.Bitmap.Config; +import android.graphics.BitmapFactory; +import android.widget.ImageView.ScaleType; + import com.android.volley.DefaultRetryPolicy; import com.android.volley.NetworkResponse; import com.android.volley.ParseError; @@ -23,24 +28,19 @@ import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.VolleyLog; -import android.graphics.Bitmap; -import android.graphics.Bitmap.Config; -import android.graphics.BitmapFactory; -import android.widget.ImageView.ScaleType; - /** * A canned request for getting an image at a given URL and calling * back with a decoded Bitmap. */ public class ImageRequest extends Request { /** Socket timeout in milliseconds for image requests */ - private static final int IMAGE_TIMEOUT_MS = 1000; + public static final int DEFAULT_IMAGE_TIMEOUT_MS = 1000; /** Default number of retries for image requests */ - private static final int IMAGE_MAX_RETRIES = 2; + public static final int DEFAULT_IMAGE_MAX_RETRIES = 2; /** Default backoff multiplier for image requests */ - private static final float IMAGE_BACKOFF_MULT = 2f; + public static final float DEFAULT_IMAGE_BACKOFF_MULT = 2f; private final Response.Listener mListener; private final Config mDecodeConfig; @@ -71,9 +71,9 @@ public class ImageRequest extends Request { */ public ImageRequest(String url, Response.Listener listener, int maxWidth, int maxHeight, ScaleType scaleType, Config decodeConfig, Response.ErrorListener errorListener) { - super(Method.GET, url, errorListener); - setRetryPolicy( - new DefaultRetryPolicy(IMAGE_TIMEOUT_MS, IMAGE_MAX_RETRIES, IMAGE_BACKOFF_MULT)); + super(Method.GET, url, errorListener); + setRetryPolicy(new DefaultRetryPolicy(DEFAULT_IMAGE_TIMEOUT_MS, DEFAULT_IMAGE_MAX_RETRIES, + DEFAULT_IMAGE_BACKOFF_MULT)); mListener = listener; mDecodeConfig = decodeConfig; mMaxWidth = maxWidth; diff --git a/src/test/java/com/android/volley/toolbox/ImageRequestTest.java b/src/test/java/com/android/volley/toolbox/ImageRequestTest.java index 0ae774e..7154d01 100644 --- a/src/test/java/com/android/volley/toolbox/ImageRequestTest.java +++ b/src/test/java/com/android/volley/toolbox/ImageRequestTest.java @@ -22,6 +22,7 @@ import android.widget.ImageView; import android.widget.ImageView.ScaleType; import com.android.volley.NetworkResponse; import com.android.volley.Response; + import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -168,5 +169,8 @@ public class ImageRequestTest { assertNotNull(ImageRequest.class.getConstructor(String.class, Response.Listener.class, int.class, int.class, ImageView.ScaleType.class, Bitmap.Config.class, Response.ErrorListener.class)); + assertEquals(ImageRequest.DEFAULT_IMAGE_TIMEOUT_MS, 1000); + assertEquals(ImageRequest.DEFAULT_IMAGE_MAX_RETRIES, 2); + assertEquals(ImageRequest.DEFAULT_IMAGE_BACKOFF_MULT, 2f); } } -- cgit v1.2.3