Fixed crash when the device is turned while the warning dialog about server certifica...

[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..8ebdcbe 100644 (file)
--- a/src/eu/alefzero/webdav/FileRequestEntity.java
+++ b/src/eu/alefzero/webdav/FileRequestEntity.java
@@ -1,13 +1,20 @@
 package eu.alefzero.webdav;
 
 import java.io.File;
 package eu.alefzero.webdav;
 
 import java.io.File;

-import java.io.FileInputStream;

 import java.io.IOException;
 import java.io.IOException;

-import java.io.InputStream;

 import java.io.OutputStream;
 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 org.apache.commons.httpclient.methods.RequestEntity;
 

+import eu.alefzero.webdav.OnDatatransferProgressListener;
+
+import android.util.Log;
+
+

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


@@ -16,7 +23,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,22 +46,35 @@ 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;
     }

-
+    

     public void writeRequest(final OutputStream out) throws IOException {
     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;
         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 {
         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) 
                 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 {
         } finally {

-            instream.close();
+            //instream.close();
+            lock.release();
+            channel.close();

         }
     }
 
         }
     }