Fixed the lack of warning when a non trusted SSL certificate is found if the user...

[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 ca16e89..f8ba320 100644 (file)
--- a/src/eu/alefzero/webdav/FileRequestEntity.java
+++ b/src/eu/alefzero/webdav/FileRequestEntity.java
@@ -5,10 +5,18 @@ 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 java.nio.channels.OverlappingFileLockException;
 
 import org.apache.commons.httpclient.methods.RequestEntity;
 
-import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener;
+import eu.alefzero.webdav.OnDatatransferProgressListener;
+
+import android.util.Log;
+
 
 /**
  * A RequestEntity that represents a File.
@@ -46,17 +54,30 @@ public class FileRequestEntity implements RequestEntity {
     }
 
     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);
+        
+        FileChannel channel = new RandomAccessFile(this.file, "rw").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 (listener != null) 
                     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();
+            //instream.close();
+            lock.release();
+            channel.close();
         }
     }