From: David A. Velasco Date: Tue, 8 Oct 2013 13:06:20 +0000 (+0200) Subject: The app goes directly to root folder when the current folder does not exist anymore... X-Git-Tag: oc-android-1.5.5~155^2~19 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ec85b4225ec8c818578602bb7e1d78bb0e51b626?ds=inline;hp=--cc The app goes directly to root folder when the current folder does not exist anymore after refreshing with server --- ec85b4225ec8c818578602bb7e1d78bb0e51b626 diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index febcd598..d86feb51 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -881,7 +881,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa String.format(getString(R.string.sync_current_folder_was_removed), mDirectories.getItem(0)), Toast.LENGTH_LONG) .show(); - onBackPressed(); + jumpToRoot(); } else { if (currentFile == null && !getFile().isDirectory()) { @@ -978,6 +978,21 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa } + public void jumpToRoot() { + OCFileListFragment listOfFiles = getListOfFilesFragment(); + if (listOfFiles != null) { // should never be null, indeed + while (mDirectories.getCount() > 1) { + popDirname(); + } + OCFile root = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR); + listOfFiles.listDirectory(root); + setFile(listOfFiles.getCurrentFile()); + startSyncFolderOperation(root); + } + cleanSecondFragment(); + } + + /** * {@inheritDoc} *