projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OC-2755: Refresh account shows empty icon sometimes
[pub/Android/ownCloud.git]
/
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
0eb1966
..
737810f
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@
-923,13
+923,7
@@
OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
RemoteOperationResult synchResult = (RemoteOperationResult)intent.getSerializableExtra(FileSyncService.SYNC_RESULT);
if (getAccount() != null && accountName.equals(getAccount().name)
RemoteOperationResult synchResult = (RemoteOperationResult)intent.getSerializableExtra(FileSyncService.SYNC_RESULT);
if (getAccount() != null && accountName.equals(getAccount().name)
- && mStorageManager != null
- ) {
-
- /// get the shared files
- if (isSharedSupported()) {
- startGetShares();
- }
+ && mStorageManager != null) {
String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH);
String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH);
@@
-961,6
+955,10
@@
OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
}
if (!mRefreshSharesInProgress) {
}
if (!mRefreshSharesInProgress) {
+ /// get the shared files
+ if (isSharedSupported()) {
+ startGetShares();
+ }
setSupportProgressBarIndeterminateVisibility(inProgress);
} else {
setSupportProgressBarIndeterminateVisibility(true);
setSupportProgressBarIndeterminateVisibility(inProgress);
} else {
setSupportProgressBarIndeterminateVisibility(true);