Update build file and some bug fixes

Author: loopj

build.xml

@@ -1,40 +1,48 @@
 <project default="package">
+    <!-- Project properties -->
     <property name="version.num" value="1.0.0" />
-    <buildnumber file="build.num" />
+    <property name="project" value="android-smart-image-view" />
+
+    <!-- Standard jar stuff -->
+    <property name="jarfile" value="${project}-${version.num}.jar" />
     <property name="lib.dir" value="/usr/local/android_sdk/platforms/android-7/" />
     <property name="build.dir" value="./build"/>
     <property name="classes.dir"  value="${build.dir}/classes"/>
+    <buildnumber file="build.num" />
 
+    <!-- Set up classpath -->
     <path id="classpath">
         <fileset dir="${lib.dir}" includes="**/*.jar" />
     </path>
 
+    <!-- Compile java files into classes -->
     <target name="compile">
         <mkdir dir="${build.dir}" />
         <mkdir dir="${classes.dir}" />
-        <javac srcdir="src" destdir="${classes.dir}" classpathref="classpath" includeantruntime="false">
-            <compilerarg value="-Xlint:unchecked"/>
-        </javac>
+        <javac srcdir="." destdir="${classes.dir}" classpathref="classpath" />
     </target>
 
+    <!-- Package a jar from compiled class files -->
     <target name="jar" depends="compile">
-        <delete file="smart-image.jar" />
+        <delete file="${jarfile}" />
         <delete file="MANIFEST.MF" />
         <manifest file="MANIFEST.MF">
             <attribute name="Built-By" value="${user.name}" />
             <attribute name="Implementation-Version" value="${version.num}-b${build.number}"/> 
         </manifest>
 
-        <jar destfile="smart-image.jar" basedir="build/classes" includes="**/*.class" manifest="MANIFEST.MF" />
+        <jar destfile="${jarfile}" basedir="build/classes" includes="**/*.class" manifest="MANIFEST.MF" />
     </target>
 
+    <!-- Clean out the build files -->
     <target name="clean">
         <delete dir="build" />
         <delete>
-            <fileset dir="." includes="smart-image.jar*"/>
+            <fileset dir="." includes="${jarfile}"/>
             <fileset file="MANIFEST.MF"/>
-        </delete>  
+        </delete>
     </target>
 
+    <!-- Compile and package a jar -->
     <target name="package" depends="compile,jar" />
 </project>

src/com/loopj/android/image/SmartImageView.java

@@ -67,7 +67,7 @@ public void setImage(final SmartImage image, final Integer fallbackResource) {
 
     public void setImage(final SmartImage image, final Integer fallbackResource, final Integer loadingResource) {
         // Set a loading resource
-        if(loadingResource != null && getDrawable() == null){
+        if(loadingResource != null){
             setImageResource(loadingResource);
         }
 
@@ -97,7 +97,7 @@ public void onComplete(Bitmap bitmap) {
         threadPool.execute(currentTask);
     }
 
-    private static void cancelAllTasks() {
+    public static void cancelAllTasks() {
         threadPool.shutdownNow();
         threadPool = Executors.newFixedThreadPool(LOADING_THREADS);
     }

src/com/loopj/android/image/WebImage.java

@@ -9,8 +9,8 @@
 import android.graphics.BitmapFactory;
 
 public class WebImage implements SmartImage {
-    private static final int CONNECT_TIMEOUT = 1000;
-    private static final int READ_TIMEOUT = 1000;
+    private static final int CONNECT_TIMEOUT = 5000;
+    private static final int READ_TIMEOUT = 10000;
 
     private static WebImageCache webImageCache;
 
@@ -27,11 +27,14 @@ public Bitmap getBitmap(Context context) {
         }
 
         // Try getting bitmap from cache first
-        Bitmap bitmap = webImageCache.get(url);
-        if(bitmap == null) {
-            bitmap = getBitmapFromUrl(url);
-            if(bitmap != null){
-                webImageCache.put(url, bitmap);
+        Bitmap bitmap = null;
+        if(url != null) {
+            bitmap = webImageCache.get(url);
+            if(bitmap == null) {
+                bitmap = getBitmapFromUrl(url);
+                if(bitmap != null){
+                    webImageCache.put(url, bitmap);
+                }
             }
         }
 

src/com/loopj/android/image/WebImageCache.java

@@ -106,7 +106,7 @@ public void run() {
                 if(diskCacheEnabled) {
                     BufferedOutputStream ostream = null;
                     try {
-                        ostream = new BufferedOutputStream(new FileOutputStream(new File(diskCachePath, getCacheKey(url))));
+                        ostream = new BufferedOutputStream(new FileOutputStream(new File(diskCachePath, getCacheKey(url))), 2*1024);
                         bitmap.compress(CompressFormat.PNG, 100, ostream);
                     } catch (FileNotFoundException e) {
                         e.printStackTrace();