|
@@ -329,9 +329,6 @@ public class FileDisplayActivity extends FileActivity
|
|
|
syncAndUpdateFolder(true);
|
|
|
}
|
|
|
|
|
|
- showProgressBar(mSyncInProgress);
|
|
|
- // always AFTER setContentView(...) in onCreate(); to work around bug in its implementation
|
|
|
-
|
|
|
upgradeNotificationForInstantUpload();
|
|
|
checkOutdatedServer();
|
|
|
}
|
|
@@ -1199,6 +1196,8 @@ public class FileDisplayActivity extends FileActivity
|
|
|
protected void onResume() {
|
|
|
Log_OC.v(TAG, "onResume() start");
|
|
|
super.onResume();
|
|
|
+ // Instead of onPostCreate, starting the loading in onResume for children fragments
|
|
|
+ getListOfFilesFragment().setLoading(mSyncInProgress);
|
|
|
syncAndUpdateFolder(false);
|
|
|
|
|
|
OCFile startFile = null;
|
|
@@ -1389,8 +1388,7 @@ public class FileDisplayActivity extends FileActivity
|
|
|
DataHolderUtil.getInstance().delete(intent.getStringExtra(FileSyncAdapter.EXTRA_RESULT));
|
|
|
|
|
|
Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
|
|
|
- showProgressBar(mSyncInProgress);
|
|
|
-
|
|
|
+ getListOfFilesFragment().setLoading(mSyncInProgress);
|
|
|
setBackgroundText();
|
|
|
}
|
|
|
}
|
|
@@ -1507,9 +1505,7 @@ public class FileDisplayActivity extends FileActivity
|
|
|
// TODO what about other kind of previews?
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- showProgressBar(false);
|
|
|
-
|
|
|
+ getListOfFilesFragment().setLoading(false);
|
|
|
} finally {
|
|
|
if (intent != null) {
|
|
|
removeStickyBroadcast(intent);
|
|
@@ -2222,7 +2218,7 @@ public class FileDisplayActivity extends FileActivity
|
|
|
null
|
|
|
);
|
|
|
|
|
|
- showProgressBar(true);
|
|
|
+ getListOfFilesFragment().setLoading(true);
|
|
|
|
|
|
setBackgroundText();
|
|
|
|