Merge remote-tracking branch 'origin/master'

[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 70154ec..ca16e89 100644 (file)
--- a/src/eu/alefzero/webdav/FileRequestEntity.java
+++ b/src/eu/alefzero/webdav/FileRequestEntity.java
@@ -8,46 +8,56 @@ import java.io.OutputStream;
 
 import org.apache.commons.httpclient.methods.RequestEntity;
 
 
 import org.apache.commons.httpclient.methods.RequestEntity;
 

+import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener;
+

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

- *
+ * 

  */
 public class FileRequestEntity implements RequestEntity {
 
  */
 public class FileRequestEntity implements RequestEntity {
 

-  final File file;
-  final String contentType;
+    final File file;
+    final String contentType;
+    OnDatatransferProgressListener listener;
+
+    public FileRequestEntity(final File file, final String contentType) {
+        super();
+        if (file == null) {
+            throw new IllegalArgumentException("File may not be null");
+        }
+        this.file = file;
+        this.contentType = contentType;
+    }
+    
+    public long getContentLength() {
+        return this.file.length();
+    }

 
 

-  public FileRequestEntity(final File file, final String contentType) {
-    super();
-    if (file == null) {
-      throw new IllegalArgumentException("File may not be null");
+    public String getContentType() {
+        return this.contentType;

     }
     }

-    this.file = file;
-    this.contentType = contentType;
-  }
-  public long getContentLength() {
-    return this.file.length();
-  }
-
-  public String getContentType() {
-    return this.contentType;
-  }
-
-  public boolean isRepeatable() {
-    return true;
-  }
-
-  public void writeRequest(final OutputStream out) throws IOException {
-    byte[] tmp = new byte[4096];
-    int i = 0;
-    InputStream instream = new FileInputStream(this.file);
-    try {
-      while ((i = instream.read(tmp)) >= 0) {
-        out.write(tmp, 0, i);
-      }
-    } finally {
-      instream.close();
+
+    public boolean isRepeatable() {
+        return true;
+    }
+    
+    public void setOnDatatransferProgressListener(OnDatatransferProgressListener listener) {
+        this.listener = listener;
+    }
+
+    public void writeRequest(final OutputStream out) throws IOException {
+        byte[] tmp = new byte[4096];
+        int i = 0;
+        InputStream instream = new FileInputStream(this.file);
+        try {
+            while ((i = instream.read(tmp)) >= 0) {
+                out.write(tmp, 0, i);
+                if (listener != null) 
+                    listener.transferProgress(i);
+            }
+        } finally {
+            instream.close();
+        }

     }
     }

-  }

 
 }
\ No newline at end of file
 
 }
\ No newline at end of file