X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/b884276998a4d78b5eedfe657c91a4753434b6b9..5b6475cc842a9d1fdeaf75901c1e31df37d2d490:/src/com/owncloud/android/ui/fragment/FileDetailFragment.java diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index e7cfc945..9de098b1 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -415,7 +415,7 @@ public class FileDetailFragment extends FileFragment implements private void renameFile() { OCFile file = getFile(); String fileName = file.getFileName(); - int extensionStart = file.isDirectory() ? -1 : fileName.lastIndexOf("."); + int extensionStart = file.isFolder() ? -1 : fileName.lastIndexOf("."); int selectionEnd = (extensionStart >= 0) ? extensionStart : fileName.length(); EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.rename_dialog_title), fileName, 0, selectionEnd, this); dialog.show(getFragmentManager(), "nameeditdialog"); @@ -446,11 +446,10 @@ public class FileDetailFragment extends FileFragment implements } } else { - mLastRemoteOperation = new SynchronizeFileOperation(file, null, mStorageManager, mAccount, true, false, getActivity()); + mLastRemoteOperation = new SynchronizeFileOperation(file, null, mStorageManager, mAccount, true, getActivity()); mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity()); // update ui - //boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity; ((FileDisplayActivity) getActivity()).showLoadingDialog(); } @@ -465,8 +464,7 @@ public class FileDetailFragment extends FileFragment implements true, mStorageManager); mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity()); - - //boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity; + ((FileDisplayActivity) getActivity()).showLoadingDialog(); } } @@ -759,7 +757,6 @@ public class FileDetailFragment extends FileFragment implements newFilename, new FileDataStorageManager(mAccount, getActivity().getContentResolver())); mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity()); - //boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity; ((FileDisplayActivity) getActivity()).showLoadingDialog(); } } @@ -832,10 +829,7 @@ public class FileDetailFragment extends FileFragment implements i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, mAccount); startActivity(i); - } else { - Toast msg = Toast.makeText(getActivity(), R.string.sync_file_fail_msg, Toast.LENGTH_LONG); - msg.show(); - } + } if (file.isDown()) { setButtonsForDown();