Buttons in details view are unlocked when after a failed 'refresh' click (due to...

diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
index 31dd5dc..f98de11 100644 (file)
--- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
@@ -40,7 +40,9 @@ import eu.alefzero.webdav.WebdavUtils;
 public class SynchronizeFileOperation extends RemoteOperation {
 
     private String TAG = SynchronizeFileOperation.class.getSimpleName();
 public class SynchronizeFileOperation extends RemoteOperation {
 
     private String TAG = SynchronizeFileOperation.class.getSimpleName();

-    //private String mRemotePath;
+    private static final int SYNC_READ_TIMEOUT = 10000;
+    private static final int SYNC_CONNECTION_TIMEOUT = 5000;
+    

     private OCFile mLocalFile;
     private OCFile mServerFile;
     private DataStorageManager mStorageManager;
     private OCFile mLocalFile;
     private OCFile mServerFile;
     private DataStorageManager mStorageManager;


@@ -88,7 +90,7 @@ public class SynchronizeFileOperation extends RemoteOperation {
                 if (mServerFile == null) {
                     /// take the duty of check the server for the current state of the file there
                     propfind = new PropFindMethod(client.getBaseUri() + WebdavUtils.encodePath(mLocalFile.getRemotePath()));
                 if (mServerFile == null) {
                     /// take the duty of check the server for the current state of the file there
                     propfind = new PropFindMethod(client.getBaseUri() + WebdavUtils.encodePath(mLocalFile.getRemotePath()));

-                    int status = client.executeMethod(propfind);
+                    int status = client.executeMethod(propfind, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT);

                     boolean isMultiStatus = status == HttpStatus.SC_MULTI_STATUS;
                     if (isMultiStatus) {
                         MultiStatus resp = propfind.getResponseBodyAsMultiStatus();
                     boolean isMultiStatus = status == HttpStatus.SC_MULTI_STATUS;
                     if (isMultiStatus) {
                         MultiStatus resp = propfind.getResponseBodyAsMultiStatus();

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index ade8989..60d6340 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -1003,6 +1003,13 @@ public class FileDetailFragment extends SherlockFragment implements
                 msg.show();\r
             }\r
             \r
                 msg.show();\r
             }\r
             \r

+            if (mFile.isDown()) {\r
+                setButtonsForDown();\r
+                \r
+            } else {\r
+                setButtonsForRemote();\r
+            }\r
+            \r

         } else {\r
             if (operation.transferWasRequested()) {\r
                 mContainerActivity.onFileStateChanged();    // this is not working; FileDownloader won't do NOTHING at all until this method finishes, so \r
         } else {\r
             if (operation.transferWasRequested()) {\r
                 mContainerActivity.onFileStateChanged();    // this is not working; FileDownloader won't do NOTHING at all until this method finishes, so \r