From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 20 Nov 2012 10:00:56 +0000 (+0100)
Subject: Buttons in details view are unlocked when after a failed 'refresh' click (due to... 
X-Git-Tag: oc-android-1.4.3~99
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9c38fbae1da1f41938d9687e2b2898d8404b599a?ds=inline;hp=--cc

Buttons in details view are unlocked when after a failed 'refresh' click (due to server is down)
---

9c38fbae1da1f41938d9687e2b2898d8404b599a
diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
index 31dd5dc8..f98de115 100644
--- 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();
-    //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;
@@ -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()));
-                    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();
diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index ade89899..60d6340b 100644
--- 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();
             }
             
+            if (mFile.isDown()) {
+                setButtonsForDown();
+                
+            } else {
+                setButtonsForRemote();
+            }
+            
         } else {
             if (operation.transferWasRequested()) {
                 mContainerActivity.onFileStateChanged();    // this is not working; FileDownloader won't do NOTHING at all until this method finishes, so