Version update

[pub/Android/ownCloud.git] / src / eu / alefzero / webdav / FileRequestEntity.java

diff --git a/src/eu/alefzero/webdav/FileRequestEntity.java b/src/eu/alefzero/webdav/FileRequestEntity.java
index e466aa1..61ba456 100644 (file)
--- a/src/eu/alefzero/webdav/FileRequestEntity.java
+++ b/src/eu/alefzero/webdav/FileRequestEntity.java
@@ -8,6 +8,11 @@ import java.io.OutputStream;
 
 import org.apache.commons.httpclient.methods.RequestEntity;
 
 
 import org.apache.commons.httpclient.methods.RequestEntity;
 

+import com.owncloud.android.files.interfaces.OnDatatransferProgressListener;
+
+import android.util.Log;
+
+

 /**
  * A RequestEntity that represents a File.
  * 
 /**
  * A RequestEntity that represents a File.
  * 


@@ -16,7 +21,7 @@ public class FileRequestEntity implements RequestEntity {
 
     final File file;
     final String contentType;
 
     final File file;
     final String contentType;

-    OnUploadProgressListener listener;
+    OnDatatransferProgressListener listener;

 
     public FileRequestEntity(final File file, final String contentType) {
         super();
 
     public FileRequestEntity(final File file, final String contentType) {
         super();


@@ -39,7 +44,7 @@ public class FileRequestEntity implements RequestEntity {
         return true;
     }
     
         return true;
     }
     

-    public void setOnUploadProgressListener(OnUploadProgressListener listener) {
+    public void setOnDatatransferProgressListener(OnDatatransferProgressListener listener) {

         this.listener = listener;
     }
 
         this.listener = listener;
     }
 


@@ -51,8 +56,12 @@ public class FileRequestEntity implements RequestEntity {
             while ((i = instream.read(tmp)) >= 0) {
                 out.write(tmp, 0, i);
                 if (listener != null) 
             while ((i = instream.read(tmp)) >= 0) {
                 out.write(tmp, 0, i);
                 if (listener != null) 

-                    listener.OnUploadProgress(i);
+                    listener.transferProgress(i);

             }
             }

+        } catch (IOException io) {
+            Log.e("FileRequestException", io.getMessage());
+            throw new RuntimeException("Ugly solution to workaround the default policy of retries when the server falls while uploading ; temporal fix; really", io);   
+            

         } finally {
             instream.close();
         }
         } finally {
             instream.close();
         }