Updating synchronization for providing SSL warning when necessary; step 1: refactorin...

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

diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index 2e3ef87..6f98f50 100644 (file)
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -22,7 +22,6 @@ import java.io.File;
 import java.io.FileOutputStream;\r
 import java.io.IOException;\r
 import java.io.InputStream;\r
-import java.util.Random;\r
 \r
 import org.apache.commons.httpclient.Credentials;\r
 import org.apache.commons.httpclient.HttpClient;\r
@@ -99,15 +98,15 @@ public class WebdavClient extends HttpClient {
                 int readResult;\r
                 while ((readResult = bis.read(bytes)) != -1) {\r
                     if (mDataTransferListener != null)\r
-                        mDataTransferListener.transferProgress(readResult);\r
+                        mDataTransferListener.onTransferProgress(readResult);\r
                     fos.write(bytes, 0, readResult);\r
                 }\r
+                fos.close();\r
                 ret = true;\r
             } else {\r
                 exhaustResponse(get.getResponseBodyAsStream());\r
             }\r
             Log.e(TAG, "Download of " + remoteFilePath + " to " + targetFile + " finished with HTTP status " + status + (!ret?"(FAIL)":""));\r
-            \r
         } catch (Exception e) {\r
             logException(e, "dowloading " + remoteFilePath);\r
             \r
@@ -166,7 +165,7 @@ public class WebdavClient extends HttpClient {
         try {\r
             File f = new File(localFile);\r
             FileRequestEntity entity = new FileRequestEntity(f, contentType);\r
-            entity.setOnDatatransferProgressListener(mDataTransferListener);\r
+            entity.addOnDatatransferProgressListener(mDataTransferListener);\r
             put.setRequestEntity(entity);\r
             status = executeMethod(put);\r
             \r
@@ -337,5 +336,20 @@ public class WebdavClient extends HttpClient {
     public Uri getBaseUri() {\r
         return mUri;\r
     }\r
+\r
+    public String getResultAsString(String targetUrl) {\r
+        String getResult = null;\r
+        try {\r
+            GetMethod get = new GetMethod(targetUrl);\r
+            int status = executeMethod(get);\r
+            if (status == HttpStatus.SC_OK) {\r
+                getResult = get.getResponseBodyAsString();\r
+            }\r
+        } catch (Exception e) {\r
+            Log.e(TAG, "Error while getting requested file: " + targetUrl, e);\r
+            getResult = null;\r
+        }\r
+        return getResult;\r
+    }\r
     \r
 }\r