X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/52bd01bcedf1b8f13c49b67ee40a848bae1a9d40..1d5087d736b823c3ce22c80975e202059c44751c:/src/com/owncloud/android/ui/preview/PreviewImageFragment.java diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 8df06bfe..1582b6af 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -16,7 +16,6 @@ */ package com.owncloud.android.ui.preview; -import java.io.File; import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -47,22 +46,21 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; +import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.operations.OnRemoteOperationListener; -import com.owncloud.android.operations.RemoteOperation; -import com.owncloud.android.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.network.WebdavUtils; +import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.operations.RemoveFileOperation; +import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment; import com.owncloud.android.ui.fragment.FileFragment; - -import com.owncloud.android.Log_OC; -import com.owncloud.android.R; -import eu.alefzero.webdav.WebdavUtils; +import com.owncloud.android.utils.Log_OC; /** @@ -74,14 +72,12 @@ import eu.alefzero.webdav.WebdavUtils; * * @author David A. Velasco */ -public class PreviewImageFragment extends SherlockFragment implements FileFragment, - OnRemoteOperationListener, +public class PreviewImageFragment extends FileFragment implements OnRemoteOperationListener, ConfirmationDialogFragment.ConfirmationDialogFragmentListener { public static final String EXTRA_FILE = "FILE"; public static final String EXTRA_ACCOUNT = "ACCOUNT"; private View mView; - private OCFile mFile; private Account mAccount; private FileDataStorageManager mStorageManager; private ImageView mImageView; @@ -108,7 +104,7 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag * @param ignoreFirstSavedState Flag to work around an unexpected behaviour of {@link FragmentStatePagerAdapter}; TODO better solution */ public PreviewImageFragment(OCFile fileToDetail, Account ocAccount, boolean ignoreFirstSavedState) { - mFile = fileToDetail; + super(fileToDetail); mAccount = ocAccount; mStorageManager = null; // we need a context to init this; the container activity is not available yet at this moment mIgnoreFirstSavedState = ignoreFirstSavedState; @@ -123,7 +119,7 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag * DO NOT CALL IT: an {@link OCFile} and {@link Account} must be provided for a successful construction */ public PreviewImageFragment() { - mFile = null; + super(); mAccount = null; mStorageManager = null; mIgnoreFirstSavedState = false; @@ -180,19 +176,33 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag mStorageManager = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver()); if (savedInstanceState != null) { if (!mIgnoreFirstSavedState) { - mFile = savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_FILE); + OCFile file = (OCFile)savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_FILE); mAccount = savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_ACCOUNT); + + // Update the file + if (mAccount!= null) { + mStorageManager = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver()); + OCFile updatedFile = mStorageManager.getFileByPath(file.getRemotePath()); + if (updatedFile != null) { + setFile(updatedFile); + } else { + setFile(file); + } + } else { + setFile(file); + } + } else { mIgnoreFirstSavedState = false; } } - if (mFile == null) { + if (getFile() == null) { throw new IllegalStateException("Instanced with a NULL OCFile"); } if (mAccount == null) { throw new IllegalStateException("Instanced with a NULL ownCloud Account"); } - if (!mFile.isDown()) { + if (!getFile().isDown()) { throw new IllegalStateException("There is no local file to preview"); } } @@ -204,7 +214,7 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putParcelable(PreviewImageFragment.EXTRA_FILE, mFile); + outState.putParcelable(PreviewImageFragment.EXTRA_FILE, getFile()); outState.putParcelable(PreviewImageFragment.EXTRA_ACCOUNT, mAccount); } @@ -212,9 +222,9 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag @Override public void onStart() { super.onStart(); - if (mFile != null) { + if (getFile() != null) { BitmapLoader bl = new BitmapLoader(mImageView, mMessageView, mProgressWheel); - bl.execute(new String[]{mFile.getStoragePath()}); + bl.execute(new String[]{getFile().getStoragePath()}); } } @@ -234,6 +244,11 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag toHide.add(R.id.action_cancel_upload); toHide.add(R.id.action_download_file); toHide.add(R.id.action_rename_file); // by now + + // Options shareLink + if (!getFile().isShareByLink()) { + toHide.add(R.id.action_unshare_file); + } for (int i : toHide) { item = menu.findItem(i); @@ -245,6 +260,27 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag } + /** + * {@inheritDoc} + */ + @Override + public void onPrepareOptionsMenu(Menu menu) { + super.onPrepareOptionsMenu(menu); + + MenuItem item = menu.findItem(R.id.action_unshare_file); + // Options shareLink + OCFile file = ((FileActivity) getSherlockActivity()).getFile(); + if (!file.isShareByLink()) { + item.setVisible(false); + item.setEnabled(false); + } else { + item.setVisible(true); + item.setEnabled(true); + } + + } + + /** * {@inheritDoc} @@ -252,6 +288,16 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { + case R.id.action_share_file: { + FileActivity act = (FileActivity)getSherlockActivity(); + act.getFileOperationsHelper().shareFileWithLink(getFile(), act); + return true; + } + case R.id.action_unshare_file: { + FileActivity act = (FileActivity)getSherlockActivity(); + act.getFileOperationsHelper().unshareFileWithLink(getFile(), act); + return true; + } case R.id.action_open_file_with: { openFile(); return true; @@ -264,50 +310,40 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag seeDetails(); return true; } + case R.id.action_send_file: { + shareFile(); + return true; + } default: return false; } } + + private void shareFile(){ + Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND); + // set MimeType + sharingIntent.setType(getFile().getMimetype()); + sharingIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://"+getFile().getStoragePath())); + startActivity(Intent.createChooser(sharingIntent, "Share via")); + } + private void seeDetails() { - ((FileFragment.ContainerActivity)getActivity()).showFragmentWithDetails(mFile); + ((FileFragment.ContainerActivity)getActivity()).showDetails(getFile()); } @Override public void onResume() { super.onResume(); - //Log.e(TAG, "FRAGMENT, ONRESUME"); - /* - mDownloadFinishReceiver = new DownloadFinishReceiver(); - IntentFilter filter = new IntentFilter( - FileDownloader.DOWNLOAD_FINISH_MESSAGE); - getActivity().registerReceiver(mDownloadFinishReceiver, filter); - - mUploadFinishReceiver = new UploadFinishReceiver(); - filter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE); - getActivity().registerReceiver(mUploadFinishReceiver, filter); - */ - } @Override public void onPause() { super.onPause(); - /* - if (mVideoPreview.getVisibility() == View.VISIBLE) { - mSavedPlaybackPosition = mVideoPreview.getCurrentPosition(); - }*/ - /* - getActivity().unregisterReceiver(mDownloadFinishReceiver); - mDownloadFinishReceiver = null; - - getActivity().unregisterReceiver(mUploadFinishReceiver); - mUploadFinishReceiver = null; - */ } @@ -328,22 +364,23 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag * available apps for the MIME type known from the file extension, to let the user choose */ private void openFile() { - String storagePath = mFile.getStoragePath(); + OCFile file = getFile(); + String storagePath = file.getStoragePath(); String encodedStoragePath = WebdavUtils.encodePath(storagePath); try { Intent i = new Intent(Intent.ACTION_VIEW); - i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mFile.getMimetype()); + i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), file.getMimetype()); i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); startActivity(i); } catch (Throwable t) { - Log_OC.e(TAG, "Fail when trying to open with the mimeType provided from the ownCloud server: " + mFile.getMimetype()); + Log_OC.e(TAG, "Fail when trying to open with the mimeType provided from the ownCloud server: " + file.getMimetype()); boolean toastIt = true; String mimeType = ""; try { Intent i = new Intent(Intent.ACTION_VIEW); mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1)); - if (mimeType == null || !mimeType.equals(mFile.getMimetype())) { + if (mimeType == null || !mimeType.equals(file.getMimetype())) { if (mimeType != null) { i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mimeType); } else { @@ -366,7 +403,7 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag } finally { if (toastIt) { - Toast.makeText(getActivity(), "There is no application to handle file " + mFile.getFileName(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "There is no application to handle file " + file.getFileName(), Toast.LENGTH_SHORT).show(); } } @@ -384,7 +421,7 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag private void removeFile() { ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance( R.string.confirmation_remove_alert, - new String[]{mFile.getFileName()}, + new String[]{getFile().getFileName()}, R.string.confirmation_remove_remote_and_local, R.string.confirmation_remove_local, R.string.common_cancel); @@ -398,13 +435,13 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag */ @Override public void onConfirmation(String callerTag) { - if (mStorageManager.getFileById(mFile.getFileId()) != null) { // check that the file is still there; - mLastRemoteOperation = new RemoveFileOperation( mFile, // TODO we need to review the interface with RemoteOperations, and use OCFile IDs instead of OCFile objects as parameters + if (mStorageManager.getFileById(getFile().getFileId()) != null) { // check that the file is still there; + mLastRemoteOperation = new RemoveFileOperation( getFile(), // TODO we need to review the interface with RemoteOperations, and use OCFile IDs instead of OCFile objects as parameters true, mStorageManager); mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity()); - getActivity().showDialog(PreviewImageActivity.DIALOG_SHORT_WAIT); + ((PreviewImageActivity) getActivity()).showLoadingDialog(); } } @@ -414,14 +451,9 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag */ @Override public void onNeutral(String callerTag) { - // TODO this code should be made in a secondary thread, - if (mFile.isDown()) { // checks it is still there - File f = new File(mFile.getStoragePath()); - f.delete(); - mFile.setStoragePath(null); - mStorageManager.saveFile(mFile); - finish(); - } + OCFile file = getFile(); + mStorageManager.removeFile(file, false, true); // TODO perform in background task / new thread + finish(); } /** @@ -433,33 +465,6 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag } - /** - * {@inheritDoc} - */ - public OCFile getFile(){ - return mFile; - } - - /* - /** - * Use this method to signal this Activity that it shall update its view. - * - * @param file : An {@link OCFile} - *-/ - public void updateFileDetails(OCFile file, Account ocAccount) { - mFile = file; - if (ocAccount != null && ( - mStorageManager == null || - (mAccount != null && !mAccount.equals(ocAccount)) - )) { - mStorageManager = new FileDataStorageManager(ocAccount, getActivity().getApplicationContext().getContentResolver()); - } - mAccount = ocAccount; - updateFileDetails(false); - } - */ - - private class BitmapLoader extends AsyncTask { /** @@ -571,7 +576,7 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag } catch (Throwable t) { mErrorMessageId = R.string.common_error_unknown; - Log_OC.e(TAG, "Unexpected error loading " + mFile.getStoragePath(), t); + Log_OC.e(TAG, "Unexpected error loading " + getFile().getStoragePath(), t); } return result; @@ -654,7 +659,7 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag } private void onRemoveFileOperationFinish(RemoveFileOperation operation, RemoteOperationResult result) { - getActivity().dismissDialog(PreviewImageActivity.DIALOG_SHORT_WAIT); + ((PreviewImageActivity) getActivity()).dismissLoadingDialog(); if (result.isSuccess()) { Toast msg = Toast.makeText(getActivity().getApplicationContext(), R.string.remove_success_msg, Toast.LENGTH_LONG);