OCFile currFile = getFile();
if (mStorageManager != null) {
while(currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) {
- mDirectories.add(currFile.getFileName());
+ if (currFile.isDirectory()) {
+ mDirectories.add(currFile.getFileName());
+ }
currFile = mStorageManager.getFileById(currFile.getParentId());
}
}
/// Check whether the 'main' OCFile handled by the Activity is contained in the current Account
OCFile file = getFile();
if (file != null) {
- file = mStorageManager.getFileByPath(file.getRemotePath()); // currentDir = null if not in the current Account
+ if (file.isDown() && file.getLastSyncDateForProperties() == 0) {
+ // upload in progress - right now, files are not inserted in the local cache until the upload is successful
+ if (mStorageManager.getFileById(file.getParentId()) == null) {
+ file = null; // not able to know the directory where the file is uploading
+ }
+ } else {
+ file = mStorageManager.getFileByPath(file.getRemotePath()); // currentDir = null if not in the current Account
+ }
}
if (file == null) {
// fall back to root folder
private Fragment chooseInitialSecondFragment(OCFile file) {
Fragment secondFragment = null;
if (file != null && !file.isDirectory()) {
- if (file.isDown() && PreviewMediaFragment.canBePreviewed(file)) {
+ if (file.isDown() && PreviewMediaFragment.canBePreviewed(file)
+ && file.getLastSyncDateForProperties() > 0 // temporal fix
+ ) {
int startPlaybackPosition = getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0);
boolean autoplay = getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true);
secondFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition, autoplay);
*/
private void setSecondFragment(Fragment fragment) {
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- transaction.add(R.id.right_fragment_container, fragment, TAG_SECOND_FRAGMENT);
+ transaction.replace(R.id.right_fragment_container, fragment, TAG_SECOND_FRAGMENT);
transaction.commit();
}
detailsFragment.updateFileDetails(true, false);
} else if (downloadEvent.equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) {
- // update the right panel
- if (success && waitedPreview) {
- mWaitingToPreview = mStorageManager.getFileById(mWaitingToPreview.getFileId()); // update the file from database, for the local storage path
- if (PreviewMediaFragment.canBePreviewed(mWaitingToPreview)) {
- startMediaPreview(mWaitingToPreview, 0, true);
-
- } else {
- detailsFragment.updateFileDetails(false, (success));
- openFile(mWaitingToPreview);
+ // update the right panel
+ boolean detailsFragmentChanged = false;
+ if (waitedPreview) {
+ if (success) {
+ mWaitingToPreview = mStorageManager.getFileById(mWaitingToPreview.getFileId()); // update the file from database, for the local storage path
+ if (PreviewMediaFragment.canBePreviewed(mWaitingToPreview)) {
+ startMediaPreview(mWaitingToPreview, 0, true);
+ detailsFragmentChanged = true;
+ } else {
+ openFile(mWaitingToPreview);
+ }
}
mWaitingToPreview = null;
-
- } else {
+ }
+ if (!detailsFragmentChanged) {
detailsFragment.updateFileDetails(false, (success));
}
}
}
case android.R.id.home: {
FileFragment second = getSecondFragment();
- if((getFile() != null && getFile().getParentId() != 0) ||
+ OCFile currentDir = getCurrentDir();
+ if((currentDir != null && currentDir.getParentId() != 0) ||
(second != null && second.getFile() != null)) {
onBackPressed();
}
@Override
public void onBackPressed() {
+ OCFileListFragment listOfFiles = getListOfFilesFragment();
if (mDualPane || getSecondFragment() == null) {
- OCFileListFragment listOfFiles = getListOfFilesFragment();
if (listOfFiles != null) { // should never be null, indeed
if (mDirectories.getCount() <= 1) {
finish();
}
popDirname();
listOfFiles.onBrowseUp();
- setFile(listOfFiles.getCurrentFile());
}
}
+ if (listOfFiles != null) { // should never be null, indeed
+ setFile(listOfFiles.getCurrentFile());
+ }
cleanSecondFragment();
- updateNavigationElementsInActionBar(getFile(), null);
+ updateNavigationElementsInActionBar(null);
}
@Override
super.onStart();
FileFragment second = getSecondFragment();
updateFragmentsVisibility(second != null);
- updateNavigationElementsInActionBar(getFile(), (second == null) ? null : second.getFile());
+ updateNavigationElementsInActionBar((second == null) ? null : second.getFile());
}
@Override
// List current directory
OCFileListFragment listOfFiles = getListOfFilesFragment();
if (listOfFiles != null) {
- listOfFiles.listDirectory(getFile()); // TODO we should find the way to avoid the need of this (maybe it's not necessary yet; to check)
+ listOfFiles.listDirectory(getCurrentDir()); // TODO we should find the way to avoid the need of this (maybe it's not necessary yet; to check)
}
Log_OC.d(TAG, "onResume() end");
String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH);
boolean fillBlankRoot = false;
- OCFile currentDir = getFile();
+ OCFile currentDir = getCurrentDir();
if (currentDir == null) {
currentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);
fillBlankRoot = (currentDir != null);
String uploadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME);
boolean sameAccount = getAccount() != null && accountName.equals(getAccount().name);
- boolean isDescendant = (getFile() != null) && (uploadedRemotePath != null) && (uploadedRemotePath.startsWith(getFile().getRemotePath()));
+ OCFile currentDir = getCurrentDir();
+ boolean isDescendant = (currentDir != null) && (uploadedRemotePath != null) && (uploadedRemotePath.startsWith(currentDir.getRemotePath()));
if (sameAccount && isDescendant) {
refeshListOfFilesFragment();
}
}
private boolean isDescendant(String downloadedRemotePath) {
- return (getFile() != null && downloadedRemotePath != null && downloadedRemotePath.startsWith(getFile().getRemotePath()));
+ OCFile currentDir = getCurrentDir();
+ return (currentDir != null && downloadedRemotePath != null && downloadedRemotePath.startsWith(currentDir.getRemotePath()));
}
private boolean isSameAccount(Context context, Intent intent) {
public void onBrowsedDownTo(OCFile directory) {
pushDirname(directory);
cleanSecondFragment();
- updateNavigationElementsInActionBar(directory, null);
+ updateNavigationElementsInActionBar(null);
}
/**
Fragment mediaFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition, autoplay);
setSecondFragment(mediaFragment);
updateFragmentsVisibility(true);
- updateNavigationElementsInActionBar(getFile(), file);
+ updateNavigationElementsInActionBar(file);
+ setFile(file);
}
/**
mWaitingToPreview = file;
requestForDownload();
updateFragmentsVisibility(true);
- updateNavigationElementsInActionBar(getFile(), file);
+ updateNavigationElementsInActionBar(file);
+ setFile(file);
}
Fragment detailFragment = new FileDetailFragment(file, getAccount());
setSecondFragment(detailFragment);
updateFragmentsVisibility(true);
- updateNavigationElementsInActionBar(getFile(), file);
+ updateNavigationElementsInActionBar(file);
+ setFile(file);
}
/**
* TODO
*/
- private void updateNavigationElementsInActionBar(OCFile currentDir, OCFile currentFile) {
+ private void updateNavigationElementsInActionBar(OCFile currentFile) {
ActionBar actionBar = getSupportActionBar();
if (currentFile == null || mDualPane) {
// only list of files - set for browsing through folders
+ OCFile currentDir = getCurrentDir();
actionBar.setDisplayHomeAsUpEnabled(currentDir != null && currentDir.getParentId() != 0);
actionBar.setDisplayShowTitleEnabled(false);
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
*/
@Override
public OCFile getInitialDirectory() {
- return getFile();
+ return getCurrentDir();
}
if (second != null && removedFile.equals(second.getFile())) {
cleanSecondFragment();
}
- if (mStorageManager.getFileById(removedFile.getParentId()).equals(getFile())) {
+ if (mStorageManager.getFileById(removedFile.getParentId()).equals(getCurrentDir())) {
refeshListOfFilesFragment();
}
((FileDetailFragment) details).updateFileDetails(renamedFile, getAccount());
}
}
- if (mStorageManager.getFileById(renamedFile.getParentId()).equals(getFile())) {
+ if (mStorageManager.getFileById(renamedFile.getParentId()).equals(getCurrentDir())) {
refeshListOfFilesFragment();
}
String newDirectoryName = dialog.getNewFilename().trim();
Log_OC.d(TAG, "'create directory' dialog dismissed with new name " + newDirectoryName);
if (newDirectoryName.length() > 0) {
- String path;
- if (getFile() == null) {
- // this is just a patch; we should ensure that mCurrentDir never is null
- if (!mStorageManager.fileExists(OCFile.PATH_SEPARATOR)) {
- OCFile file = new OCFile(OCFile.PATH_SEPARATOR);
- mStorageManager.saveFile(file);
- }
- setFile(mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR));
- }
- path = FileDisplayActivity.this.getFile().getRemotePath();
+ String path = getCurrentDir().getRemotePath();
// Create directory
path += newDirectoryName + OCFile.PATH_SEPARATOR;
- RemoteOperation operation = new CreateFolderOperation(path, getFile().getFileId(), mStorageManager);
+ RemoteOperation operation = new CreateFolderOperation(path, getCurrentDir().getFileId(), mStorageManager);
operation.execute( getAccount(),
FileDisplayActivity.this,
FileDisplayActivity.this,
startService(i);
}
}
-
+
+
+ private OCFile getCurrentDir() {
+ OCFile file = getFile();
+ if (file != null) {
+ if (file.isDirectory()) {
+ return file;
+ } else {
+ return mStorageManager.getFileById(file.getParentId());
+ }
+ } else {
+ return null;
+ }
+ }
}
projects / pub / Android / ownCloud.git / blobdiff