X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/435b31ba4f3597cc7a43270cd4a54fb0180956c1..76ba00b2b23f5c2079a6635dc5e661850c3c5dfb:/src/eu/alefzero/webdav/FileRequestEntity.java

diff --git a/src/eu/alefzero/webdav/FileRequestEntity.java b/src/eu/alefzero/webdav/FileRequestEntity.java
index 3fc0ab03..df6bdff4 100644
--- a/src/eu/alefzero/webdav/FileRequestEntity.java
+++ b/src/eu/alefzero/webdav/FileRequestEntity.java
@@ -1,53 +1,88 @@
 package eu.alefzero.webdav;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
 
 import org.apache.commons.httpclient.methods.RequestEntity;
 
+import eu.alefzero.webdav.OnDatatransferProgressListener;
+
+import android.util.Log;
+
+
 /**
  * A RequestEntity that represents a File.
  * 
  */
 public class FileRequestEntity implements RequestEntity {
 
-    final File file;
-    final String contentType;
+    final File mFile;
+    final String mContentType;
+    OnDatatransferProgressListener mListener;
 
     public FileRequestEntity(final File file, final String contentType) {
         super();
+        this.mFile = file;
+        this.mContentType = contentType;
         if (file == null) {
             throw new IllegalArgumentException("File may not be null");
         }
-        this.file = file;
-        this.contentType = contentType;
     }
-
+    
+    @Override
     public long getContentLength() {
-        return this.file.length();
+        return mFile.length();
     }
 
+    @Override
     public String getContentType() {
-        return this.contentType;
+        return mContentType;
     }
 
+    @Override
     public boolean isRepeatable() {
         return true;
     }
-
+    
+    public void setOnDatatransferProgressListener(OnDatatransferProgressListener listener) {
+        mListener = listener;
+    }
+    
+    @Override
     public void writeRequest(final OutputStream out) throws IOException {
-        byte[] tmp = new byte[4096];
+        //byte[] tmp = new byte[4096];
+        ByteBuffer tmp = ByteBuffer.allocate(4096);
         int i = 0;
-        InputStream instream = new FileInputStream(this.file);
+        
+        // TODO(bprzybylski): each mem allocation can throw OutOfMemoryError we need to handle it
+        //                    globally in some fashionable manner
+        RandomAccessFile raf = new RandomAccessFile(mFile, "rw");
+        FileChannel channel = raf.getChannel();
+        FileLock lock = channel.tryLock();
+        //InputStream instream = new FileInputStream(this.file);
+        
         try {
-            while ((i = instream.read(tmp)) >= 0) {
-                out.write(tmp, 0, i);
+            //while ((i = instream.read(tmp)) >= 0) {
+            while ((i = channel.read(tmp)) >= 0) {
+                out.write(tmp.array(), 0, i);
+                tmp.clear();
+                if (mListener != null) 
+                    mListener.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();
+            //instream.close();
+            lock.release();
+            channel.close();
+            raf.close();
         }
     }