Quick patch to fix operations not ready for HTTPS

[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 7194195..503685a 100644 (file)
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -137,24 +137,25 @@ public class WebdavClient extends HttpClient {
      * Downloads a file in remoteFilepath to the local targetPath.\r
      * \r
      * @param remoteFilepath    Path to the file in the remote server, URL DECODED. \r
-     * @param targetPath        Local path to save the downloaded file.\r
+     * @param targetFile        Local path to save the downloaded file.\r
      * @return                  'True' when the file is successfully downloaded.\r
      */\r
-    public boolean downloadFile(String remoteFilepath, File targetPath) {\r
+    public boolean downloadFile(String remoteFilepath, File targetFile) {\r
         boolean ret = false;\r
+        boolean caughtException = false;\r
         GetMethod get = new GetMethod(mUri.toString() + WebdavUtils.encodePath(remoteFilepath));\r
 \r
         // get.setHeader("Host", mUri.getHost());\r
         // get.setHeader("User-Agent", "Android-ownCloud");\r
 \r
+        int status = -1;\r
         try {\r
-            int status = executeMethod(get, 0);\r
-            Log.e(TAG, "status return: " + status);\r
+            status = executeMethod(get);\r
             if (status == HttpStatus.SC_OK) {\r
-                targetPath.createNewFile();\r
+                targetFile.createNewFile();\r
                 BufferedInputStream bis = new BufferedInputStream(\r
                         get.getResponseBodyAsStream());\r
-                FileOutputStream fos = new FileOutputStream(targetPath);\r
+                FileOutputStream fos = new FileOutputStream(targetFile);\r
 \r
                 byte[] bytes = new byte[4096];\r
                 int readResult;\r
@@ -166,11 +167,28 @@ public class WebdavClient extends HttpClient {
                 ret = true;\r
             }\r
             \r
-        } catch (Throwable e) {\r
-            e.printStackTrace();\r
-            targetPath.delete();\r
+        } catch (HttpException e) {\r
+            Log.e(TAG, "HTTP exception downloading " + remoteFilepath, e);\r
+            caughtException = true;\r
+\r
+        } catch (IOException e) {\r
+            Log.e(TAG, "I/O exception downloading " + remoteFilepath, e);\r
+            caughtException = true;\r
+\r
+        } catch (Exception e) {\r
+            Log.e(TAG, "Unexpected exception downloading " + remoteFilepath, e);\r
+            caughtException = true;\r
+            \r
+        } finally {\r
+            if (!ret) {\r
+                if (!caughtException) {\r
+                    Log.e(TAG, "Download of " + remoteFilepath + " to " + targetFile + " failed with HTTP status " + status);\r
+                }\r
+                if (targetFile.exists()) {\r
+                    targetFile.delete();\r
+                }\r
+            }\r
         }\r
-        \r
         return ret;\r
     }\r
     \r
@@ -246,8 +264,12 @@ public class WebdavClient extends HttpClient {
         HeadMethod head = new HeadMethod(uri.toString());\r
         try {\r
             returnCode = client.executeMethod(head);\r
+        } catch (HttpException e) {\r
+            Log.e(TAG, "HTTP exception trying to login at " + uri.getEncodedPath(), e);\r
+        } catch (IOException e) {\r
+            Log.e(TAG, "I/O exception trying to login at " + uri.getEncodedPath(), e);\r
         } catch (Exception e) {\r
-            Log.e(TAG, "Error: " + e.getMessage());\r
+            Log.e(TAG, "Unexpected exception trying to login at " + uri.getEncodedPath(), e);\r
         }\r
         return returnCode;\r
     }\r