Visibility fixes in progress bar
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 20 Feb 2013 12:09:03 +0000 (13:09 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 20 Feb 2013 12:09:03 +0000 (13:09 +0100)
src/com/owncloud/android/ui/fragment/FileDetailFragment.java

index 1a4dd22..148c9f2 100644 (file)
@@ -365,7 +365,6 @@ public class FileDetailFragment extends SherlockFragment implements
                     // update ui \r
                     boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
                     getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
                     // update ui \r
                     boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
                     getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
-                    setButtonsForTransferring(); // disable button immediately, although the synchronization does not result in a file transference\r
                     \r
                 }\r
                 break;\r
                     \r
                 }\r
                 break;\r
@@ -776,6 +775,8 @@ public class FileDetailFragment extends SherlockFragment implements
             // hides the progress bar\r
             ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);\r
             progressBar.setVisibility(View.GONE);\r
             // hides the progress bar\r
             ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);\r
             progressBar.setVisibility(View.GONE);\r
+            TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);\r
+            progressText.setVisibility(View.GONE);\r
         }\r
     }\r
 \r
         }\r
     }\r
 \r
@@ -795,6 +796,8 @@ public class FileDetailFragment extends SherlockFragment implements
             // hides the progress bar\r
             ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);\r
             progressBar.setVisibility(View.GONE);\r
             // hides the progress bar\r
             ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);\r
             progressBar.setVisibility(View.GONE);\r
+            TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);\r
+            progressText.setVisibility(View.GONE);\r
         }\r
     }\r
     \r
         }\r
     }\r
     \r
@@ -1092,6 +1095,7 @@ public class FileDetailFragment extends SherlockFragment implements
             \r
         } else {\r
             if (operation.transferWasRequested()) {\r
             \r
         } else {\r
             if (operation.transferWasRequested()) {\r
+                setButtonsForTransferring();\r
                 mContainerActivity.onFileStateChanged();    // this is not working; FileDownloader won't do NOTHING at all until this method finishes, so \r
                                                             // checking the service to see if the file is downloading results in FALSE\r
             } else {\r
                 mContainerActivity.onFileStateChanged();    // this is not working; FileDownloader won't do NOTHING at all until this method finishes, so \r
                                                             // checking the service to see if the file is downloading results in FALSE\r
             } else {\r