From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 31 Jan 2014 11:22:49 +0000 (+0100)
Subject: Fixed visibility of progress circle for refresh
X-Git-Tag: oc-android-1.5.5~35^2~39
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/717ef7696972f9c112027615377d9b07d6c04e5e

Fixed visibility of progress circle for refresh
---

diff --git a/owncloud-android-library b/owncloud-android-library
index 8ab453d6..d731ff0e 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 8ab453d630458fc6cdcd1bf68493d82365f1c6d3
+Subproject commit d731ff0e6638a168e10a92da3915fcdd2f65aa37
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 3cdf19b0..cc7ab550 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -204,7 +204,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         // Action bar setup
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
         getSupportActionBar().setHomeButtonEnabled(true);       // mandatory since Android ICS, according to the official documentation
-        setSupportProgressBarIndeterminateVisibility(mSyncInProgress);    // always AFTER setContentView(...) ; to work around bug in its implementation
+        setSupportProgressBarIndeterminateVisibility(mSyncInProgress || mRefreshSharesInProgress);    // always AFTER setContentView(...) ; to work around bug in its implementation
         
         Log_OC.d(TAG, "onCreate() end");
     }
@@ -964,19 +964,13 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
                     setFile(currentFile);
                 }
                 
-                if (!mRefreshSharesInProgress) {
-                    /// get the shared files
-                    if (isSharedSupported()) {
-                        startGetShares();
-                    }
-                    setSupportProgressBarIndeterminateVisibility(inProgress);
-                } else {
-                    setSupportProgressBarIndeterminateVisibility(true);
+                if (synchResult != null && synchResult.isSuccess() && isSharedSupported()) {
+                    startGetShares();
                 }
                 
                 removeStickyBroadcast(intent);
                 mSyncInProgress = inProgress;
-
+                setSupportProgressBarIndeterminateVisibility(mSyncInProgress || mRefreshSharesInProgress);
             }
             
             if (synchResult != null) {
@@ -1564,8 +1558,6 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         startService(intent);
         
         mRefreshSharesInProgress = true;
-        setSupportProgressBarIndeterminateVisibility(true);
-        
     }
     
 }