X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c3ca5b5a4fda44999f215a3559921a4781f310f8..bcc972d63d3ed1d76b51a8a03a27e809983dc756:/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 77cbc492..0ae6868b 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -17,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; @@ -37,7 +35,6 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; import android.support.v4.app.FragmentStatePagerAdapter; -import android.util.Log; import android.view.Display; import android.view.LayoutInflater; import android.view.View; @@ -49,23 +46,20 @@ 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.network.OwnCloudClientUtils; -import com.owncloud.android.operations.OnRemoteOperationListener; -import com.owncloud.android.operations.RemoteOperation; -import com.owncloud.android.operations.RemoteOperationResult; +import com.owncloud.android.oc_framework.network.webdav.WebdavUtils; +import com.owncloud.android.oc_framework.operations.OnRemoteOperationListener; +import com.owncloud.android.oc_framework.operations.RemoteOperation; +import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.operations.RemoveFileOperation; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment; import com.owncloud.android.ui.fragment.FileFragment; - -import com.owncloud.android.R; -import eu.alefzero.webdav.WebdavClient; -import eu.alefzero.webdav.WebdavUtils; +import com.owncloud.android.utils.Log_OC; /** @@ -77,14 +71,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; @@ -111,7 +103,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; @@ -126,7 +118,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; @@ -183,19 +175,19 @@ 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); + setFile((OCFile)savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_FILE)); mAccount = savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_ACCOUNT); } 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"); } } @@ -207,7 +199,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); } @@ -215,9 +207,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()}); } } @@ -275,42 +267,19 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag 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; - */ } @@ -331,22 +300,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.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 { @@ -359,17 +329,17 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag } } catch (IndexOutOfBoundsException e) { - Log.e(TAG, "Trying to find out MIME type of a file without extension: " + storagePath); + Log_OC.e(TAG, "Trying to find out MIME type of a file without extension: " + storagePath); } catch (ActivityNotFoundException e) { - Log.e(TAG, "No activity found to handle: " + storagePath + " with MIME type " + mimeType + " obtained from extension"); + Log_OC.e(TAG, "No activity found to handle: " + storagePath + " with MIME type " + mimeType + " obtained from extension"); } catch (Throwable th) { - Log.e(TAG, "Unexpected problem when opening: " + storagePath, th); + Log_OC.e(TAG, "Unexpected problem when opening: " + storagePath, th); } 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(); } } @@ -387,7 +357,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); @@ -401,14 +371,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); - WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getSherlockActivity().getApplicationContext()); - mLastRemoteOperation.execute(wc, this, mHandler); + mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity()); - getActivity().showDialog(PreviewImageActivity.DIALOG_SHORT_WAIT); + ((PreviewImageActivity) getActivity()).showLoadingDialog(); } } @@ -418,14 +387,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(); } /** @@ -437,33 +401,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 { /** @@ -558,24 +495,24 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag // really load the bitmap options.inJustDecodeBounds = false; // the next decodeFile call will be real result = BitmapFactory.decodeFile(storagePath, options); - //Log.d(TAG, "Image loaded - width: " + options.outWidth + ", loaded height: " + options.outHeight); + //Log_OC.d(TAG, "Image loaded - width: " + options.outWidth + ", loaded height: " + options.outHeight); if (result == null) { mErrorMessageId = R.string.preview_image_error_unknown_format; - Log.e(TAG, "File could not be loaded as a bitmap: " + storagePath); + Log_OC.e(TAG, "File could not be loaded as a bitmap: " + storagePath); } } catch (OutOfMemoryError e) { mErrorMessageId = R.string.preview_image_error_unknown_format; - Log.e(TAG, "Out of memory occured for file " + storagePath, e); + Log_OC.e(TAG, "Out of memory occured for file " + storagePath, e); } catch (NoSuchFieldError e) { mErrorMessageId = R.string.common_error_unknown; - Log.e(TAG, "Error from access to unexisting field despite protection; file " + storagePath, e); + Log_OC.e(TAG, "Error from access to unexisting field despite protection; file " + storagePath, e); } catch (Throwable t) { mErrorMessageId = R.string.common_error_unknown; - Log.e(TAG, "Unexpected error loading " + mFile.getStoragePath(), t); + Log_OC.e(TAG, "Unexpected error loading " + getFile().getStoragePath(), t); } return result; @@ -658,7 +595,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);