X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/61f943ca7e5ccf32a8619bc2132691813de391bb..717ef7696972f9c112027615377d9b07d6c04e5e:/src/com/owncloud/android/ui/activity/FileDisplayActivity.java 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(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); - } }