Merge pull request #35 from fanhero/feature/settimeout

Exposed 'timeout' property on both platforms

README.md

@@ -111,6 +111,7 @@ About the enabled `contentMode`, you can learn more about this [here](https://de
 | clipsToBound | More details [here](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIView_Class/#//apple_ref/occ/instp/UIView/clipsToBounds) | iOS only |
 | requestHeader | An object used to define extra http request header fields |  |
 | rounded | Enable or disable the circle transformation that automatically render the image as a perfect circle | Android only |
+| timeout | Set timeout for requests |  |
 
 ### Extra methods
 
@@ -123,13 +124,15 @@ About the enabled `contentMode`, you can learn more about this [here](https://de
 | setClipsToBound | Set the `clipToBounds` property | __iOS only__ |
 | setRequestHeader | Set the `requestHeader` property |  |
 | setRounded | Set the `rounded` property | __Android only__ |
+| setTimeout | Set timeout for requests |  |
 | getContentMode | Get the value of `contentMode` property |
 | getLoadingIndicator | Get the value of `loadingIndicator` property |  |
 | getDefaultImage | Get the value of `defaultImage` property |  |
 | getBrokenLinkImage | Get the value of `brokenLinkImage` property |  |
 | getClipsToBound | Get the value of `clipToBounds` property | __iOS only__ |
 | getRequestHeader | Get the `requestHeader` property |  |
 | getRounded | Get the `rounded` property | __Android only__ |
+| getTimeout | Get current timeout of requests |  |
 
 ### Events
 

android/android/manifest

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.1.3
+version: 2.2.0
 apiversion: 3
 architectures: armeabi-v7a x86
 description: andreavitale-imageview

android/android/src/av/imageview/AVImageView.java

@@ -3,6 +3,7 @@
 import av.imageview.utils.ImageLoader;
 import av.imageview.utils.glide.GlideUrlBuilder;
 import av.imageview.utils.glide.GlideCircleTransform;
+import av.imageview.utils.glide.StreamModelLoaderWrapper;
 
 import android.app.Activity;
 import android.graphics.Bitmap;
@@ -17,6 +18,8 @@
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout.LayoutParams;
 
+import okhttp3.OkHttpClient;
+
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.GifRequestBuilder;
 import com.bumptech.glide.DrawableRequestBuilder;
@@ -28,6 +31,8 @@
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.target.SimpleTarget;
+import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader;
+import com.bumptech.glide.load.model.stream.StreamModelLoader;
 
 import org.appcelerator.kroll.common.Log;
 import org.appcelerator.kroll.KrollModule;
@@ -44,6 +49,7 @@
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 public class AVImageView extends TiUIView {
 	private static final String LCAT = "AVImageView";
@@ -54,6 +60,7 @@ public class AVImageView extends TiUIView {
     private ImageView imageView;
     private ProgressBar progressBar;
     private RelativeLayout layout;
+    private OkHttpClient okHttpClient;
 
     //Config variables
     private boolean loadingIndicator;
@@ -75,6 +82,10 @@ public AVImageView(TiViewProxy proxy) {
         this.loadingIndicator = true;
         this.contentMode = ImageViewModule.CONTENT_MODE_ASPECT_FIT;
         this.memoryCache = true;
+        this.okHttpClient = new OkHttpClient.Builder()// default timeouts are 5 seconds
+           .connectTimeout(5, TimeUnit.SECONDS)
+           .readTimeout(5, TimeUnit.SECONDS)
+           .build();
 
         //Setting up layout and imageview
         layout = new RelativeLayout(this.proxy.getActivity());
@@ -130,6 +141,12 @@ public void processProperties(KrollDict d) {
                 this.setBlob((TiBlob) uri);
             }
         }
+        if (d.containsKey("timeout")) {
+            this.okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(d.getInt("timeout"), TimeUnit.MILLISECONDS)
+                .readTimeout(d.getInt("timeout"), TimeUnit.MILLISECONDS)
+                .build();
+        }
     }
 
 	@Override
@@ -193,7 +210,10 @@ public void startRequest(String url, Boolean loadingIndicator) {
 		if (url.startsWith("file://"))
 			drawableRequest = Glide.with(this.proxy.getActivity().getBaseContext()).load(url);
 		else
-			drawableRequest = Glide.with(this.proxy.getActivity().getBaseContext()).load(GlideUrlBuilder.build(url, this.requestHeader));
+			drawableRequest = Glide
+				.with(this.proxy.getActivity().getBaseContext())
+				.using(new StreamModelLoaderWrapper<GlideUrl>(new OkHttpUrlLoader(okHttpClient)))
+				.load(GlideUrlBuilder.build(url, this.requestHeader));
 
 		//Handling GIF
 		if (this.getMimeType(url) != null && this.getMimeType(url) == "image/gif") {
@@ -231,6 +251,13 @@ public void startRequest(String url, Boolean loadingIndicator) {
 		}
     }
 
+    public void setTimeout(int timeout) {
+        this.okHttpClient = new OkHttpClient.Builder()
+            .connectTimeout(timeout, TimeUnit.MILLISECONDS)
+            .readTimeout(timeout, TimeUnit.MILLISECONDS)
+            .build();
+    }
+
     private String sanitizeUrl(String url) {
         if (url == null || !(url instanceof String))
             return null;

android/android/src/av/imageview/ImageViewProxy.java

@@ -42,6 +42,7 @@ public class ImageViewProxy extends TiViewProxy
 	private static final int MSG_SET_BROKEN_IMAGE = MSG_FIRST_ID+1004;
 	private static final int MSG_SET_CONTENT_MODE = MSG_FIRST_ID+1005;
 	private static final int MSG_SET_REQUEST_HEADER = MSG_FIRST_ID+1006;
+	private static final int MSG_SET_TIMEOUT = MSG_FIRST_ID+1007;
 
 	private Activity activity;
 
@@ -106,6 +107,12 @@ public boolean handleMessage(Message message) {
 				getView().setRequestHeader((HashMap)result.getArg());
 				result.setResult(null);
 
+				return true;
+			case MSG_SET_TIMEOUT:
+				int timeout = message.arg1;
+				getView().setTimeout(timeout);
+				result.setResult(null);
+
 				return true;
 			default:
 				return super.handleMessage(message);
@@ -228,4 +235,10 @@ public void setRequestHeader(HashMap requestHeader) {
 			TiMessenger.sendBlockingMainMessage(getMainHandler().obtainMessage(MSG_SET_REQUEST_HEADER), requestHeader);
 		}
 	}
+
+	@Kroll.setProperty
+	@Kroll.method
+	public void setTimeout(int timeout) {
+		getView().setTimeout(timeout);
+	}
 }

android/android/src/av/imageview/utils/glide/StreamModelLoaderWrapper.java

@@ -0,0 +1,27 @@
+package av.imageview.utils.glide;
+
+import java.io.InputStream;
+
+import com.bumptech.glide.load.model.GlideUrl;
+import com.bumptech.glide.load.data.DataFetcher;
+import com.bumptech.glide.load.model.ModelLoader;
+import com.bumptech.glide.load.model.stream.StreamModelLoader;
+
+/**
+ * Workaround for <a href="https://github.com/bumptech/glide/issues/1832">bumptech/glide#1832</a>.
+ *
+ * @deprecated not needed after 3.8.0
+ */
+@Deprecated
+public class StreamModelLoaderWrapper<GlideUrl> implements StreamModelLoader<GlideUrl> {
+    public final ModelLoader<GlideUrl, InputStream> wrapped;
+
+    public StreamModelLoaderWrapper(ModelLoader<GlideUrl, InputStream> wrapped) {
+        this.wrapped = wrapped;
+    }
+
+    @Override
+    public DataFetcher<InputStream> getResourceFetcher(GlideUrl model, int width, int height) {
+        return wrapped.getResourceFetcher(model, width, height);
+    }
+}

ios/example/app.js

@@ -42,7 +42,8 @@ var default_template = {
             contentMode: AvImageview.CONTENT_MODE_ASPECT_FILL,
             requestHeader: {
                 'Authorization': "Bearer YOU_CAN_PLACE_YOUR_ACCESS_TOKEN_HERE"
-            }
+            }.
+            timeout: 2500
         }
     }]
 };

ios/iphone/Classes/AvImageviewImageView.h

@@ -29,6 +29,8 @@
         NSString *brokenLinkImagePath;
 
         NSDictionary *requestHeader;
+
+        NSTimeInterval timeout;
 }
 
 -(void)setWidth_:(id)width;
@@ -40,5 +42,6 @@
 -(void)setContentMode_:(id)args;
 -(void)setClipsToBounds_:(id)clips;
 -(void)setRequestHeader_:(id)args;
+-(void)setTimeout_:(id)args;
 
 @end

ios/iphone/Classes/AvImageviewImageView.m

@@ -262,6 +262,12 @@ -(void)setRequestHeader_:(id)args {
     requestHeader = args;
 }
 
+-(void)setTimeout_:(id)args {
+    NSTimeInterval timeout = [TiUtils doubleValue:args def:5000] / 1000;
+    [[SDWebImageDownloader sharedDownloader] setDownloadTimeout:timeout];
+
+}
+
 #pragma mark utility methodds
 -(CGFloat)contentWidthForWidth:(CGFloat)suggestedWidth {
     if (autoWidth > 0) {

ios/iphone/manifest

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 1.1.0
+version: 1.2.0
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: andreavitale-imageview