Explicit default values for network timeouts; fixed null pointer in message broadcast...

diff --git a/src/eu/alefzero/owncloud/files/services/FileDownloader.java b/src/eu/alefzero/owncloud/files/services/FileDownloader.java
index cb5d0c8..e5316b3 100644 (file)
--- a/src/eu/alefzero/owncloud/files/services/FileDownloader.java
+++ b/src/eu/alefzero/owncloud/files/services/FileDownloader.java
@@ -164,16 +164,14 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
             }\r
         }\r
         \r
             }\r
         }\r
         \r

-        if (!download_result) {\r
-            tmpFile.delete();\r
-        }\r
-        \r

         mNotificationMngr.cancel(1);\r
         Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE);\r
         mNotificationMngr.cancel(1);\r
         Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE);\r

-        end.putExtra(EXTRA_REMOTE_PATH, mRemotePath);\r
-        end.putExtra(EXTRA_FILE_PATH, newFile.getAbsolutePath());\r

         end.putExtra(EXTRA_DOWNLOAD_RESULT, download_result);\r
         end.putExtra(ACCOUNT_NAME, mAccount.name);\r
         end.putExtra(EXTRA_DOWNLOAD_RESULT, download_result);\r
         end.putExtra(ACCOUNT_NAME, mAccount.name);\r

+        end.putExtra(EXTRA_REMOTE_PATH, mRemotePath);\r
+        if (download_result) {\r
+            end.putExtra(EXTRA_FILE_PATH, newFile.getAbsolutePath());\r
+        }\r

         sendBroadcast(end);\r
 \r
         if (download_result) {\r
         sendBroadcast(end);\r
 \r
         if (download_result) {\r

diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index bd58fcc..7194195 100644 (file)
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -57,6 +57,13 @@ public class WebdavClient extends HttpClient {
     private Credentials mCredentials;\r
     final private static String TAG = "WebdavClient";\r
     private static final String USER_AGENT = "Android-ownCloud";\r
     private Credentials mCredentials;\r
     final private static String TAG = "WebdavClient";\r
     private static final String USER_AGENT = "Android-ownCloud";\r

+    \r
+    /** Default timeout for waiting data from the server: 10 seconds */\r
+    public static final int DEFAULT_DATA_TIMEOUT = 10000;\r
+    \r
+    /** Default timeout for establishing a connection: infinite */\r
+    public static final int DEFAULT_CONNECTION_TIMEOUT = 0;\r
+    \r

     private OnDatatransferProgressListener mDataTransferListener;\r
     static private MultiThreadedHttpConnectionManager mConnManager = null;\r
     \r
     private OnDatatransferProgressListener mDataTransferListener;\r
     static private MultiThreadedHttpConnectionManager mConnManager = null;\r
     \r


@@ -76,6 +83,8 @@ public class WebdavClient extends HttpClient {
      * @return\r
      */\r
     public WebdavClient (Account account, Context context) {\r
      * @return\r
      */\r
     public WebdavClient (Account account, Context context) {\r

+        setDefaultTimeouts();\r
+        \r

         OwnCloudVersion ownCloudVersion = new OwnCloudVersion(AccountManager.get(context).getUserData(account,\r
                 AccountAuthenticator.KEY_OC_VERSION));\r
         String baseUrl = AccountManager.get(context).getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL);\r
         OwnCloudVersion ownCloudVersion = new OwnCloudVersion(AccountManager.get(context).getUserData(account,\r
                 AccountAuthenticator.KEY_OC_VERSION));\r
         String baseUrl = AccountManager.get(context).getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL);\r


@@ -84,13 +93,15 @@ public class WebdavClient extends HttpClient {
         String password = AccountManager.get(context).getPassword(account);\r
         \r
         mUri = Uri.parse(baseUrl + webDavPath);\r
         String password = AccountManager.get(context).getPassword(account);\r
         \r
         mUri = Uri.parse(baseUrl + webDavPath);\r

-Log.e("ASD", ""+username);\r
+        Log.e("ASD", ""+username);\r

         setCredentials(username, password);\r
     }\r
     \r
     public WebdavClient() {\r
         super(getMultiThreadedConnManager());\r
         \r
         setCredentials(username, password);\r
     }\r
     \r
     public WebdavClient() {\r
         super(getMultiThreadedConnManager());\r
         \r

+        setDefaultTimeouts();\r
+        \r

         getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT);\r
         getParams().setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);\r
         allowSelfsignedCertificates();\r
         getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT);\r
         getParams().setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);\r
         allowSelfsignedCertificates();\r


@@ -107,6 +118,14 @@ Log.e("ASD", ""+username);
             mCredentials = new UsernamePasswordCredentials(username, password);\r
         return mCredentials;\r
     }\r
             mCredentials = new UsernamePasswordCredentials(username, password);\r
         return mCredentials;\r
     }\r

+    \r
+    /**\r
+     * Sets the connection and wait-for-data timeouts to be applied by default.\r
+     */\r
+    private void setDefaultTimeouts() {\r
+        getParams().setSoTimeout(DEFAULT_DATA_TIMEOUT);\r
+        getHttpConnectionManager().getParams().setConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT);\r
+    }\r

 \r
     public void allowSelfsignedCertificates() {\r
         // https\r
 \r
     public void allowSelfsignedCertificates() {\r
         // https\r