-/* ownCloud Android client application
- * Copyright (C) 2012-2014 ownCloud Inc.
+/**
+ * ownCloud Android client application
+ *
+ * @author David A. Velasco
+ * Copyright (C) 2015 ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
import java.lang.ref.WeakReference;
import android.accounts.Account;
+import android.annotation.SuppressLint;
import android.app.Activity;
import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
+import android.graphics.Point;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.ProgressBar;
import android.widget.TextView;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
-import com.actionbarsherlock.view.MenuItem;
-import com.ortiz.touch.TouchImageView;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.FileMenuFilter;
+import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;
import com.owncloud.android.ui.fragment.FileFragment;
-import com.owncloud.android.utils.Log_OC;
+import com.owncloud.android.utils.BitmapUtils;
+import com.owncloud.android.utils.DisplayUtils;
+
+import third_parties.michaelOrtiz.TouchImageViewCustom;
/**
* This fragment shows a preview of a downloaded image.
+ *
+ * Trying to get an instance with a NULL {@link OCFile} will produce an
+ * {@link IllegalStateException}.
*
- * Trying to get an instance with NULL {@link OCFile} or ownCloud {@link Account} values will produce an {@link IllegalStateException}.
- *
- * If the {@link OCFile} passed is not downloaded, an {@link IllegalStateException} is generated on instantiation too.
- *
- * @author David A. Velasco
+ * If the {@link OCFile} passed is not downloaded, an {@link IllegalStateException} is generated on
+ * instantiation too.
*/
public class PreviewImageFragment extends FileFragment {
+
public static final String EXTRA_FILE = "FILE";
- public static final String EXTRA_ACCOUNT = "ACCOUNT";
- private View mView;
- private Account mAccount;
- private TouchImageView mImageView;
+ private static final String ARG_FILE = "FILE";
+ private static final String ARG_IGNORE_FIRST = "IGNORE_FIRST";
+
+ private TouchImageViewCustom mImageView;
private TextView mMessageView;
private ProgressBar mProgressWheel;
private static final String TAG = PreviewImageFragment.class.getSimpleName();
private boolean mIgnoreFirstSavedState;
-
+ private LoadBitmapTask mLoadBitmapTask = null;
+
+
/**
- * Creates a fragment to preview an image.
- *
- * When 'imageFile' or 'ocAccount' are null
- *
+ * Public factory method to create a new fragment that previews an image.
+ *
+ * Android strongly recommends keep the empty constructor of fragments as the only public
+ * constructor, and
+ * use {@link #setArguments(Bundle)} to set the needed arguments.
+ *
+ * This method hides to client objects the need of doing the construction in two steps.
+ *
* @param imageFile An {@link OCFile} to preview as an image in the fragment
- * @param ocAccount An ownCloud account; needed to start downloads
- * @param ignoreFirstSavedState Flag to work around an unexpected behaviour of {@link FragmentStatePagerAdapter}; TODO better solution
+ * @param ignoreFirstSavedState Flag to work around an unexpected behaviour of
+ * {@link FragmentStatePagerAdapter}
+ * ; TODO better solution
*/
- public PreviewImageFragment(OCFile fileToDetail, Account ocAccount, boolean ignoreFirstSavedState) {
- super(fileToDetail);
- mAccount = ocAccount;
- mIgnoreFirstSavedState = ignoreFirstSavedState;
+ public static PreviewImageFragment newInstance(OCFile imageFile, boolean ignoreFirstSavedState){
+ PreviewImageFragment frag = new PreviewImageFragment();
+ Bundle args = new Bundle();
+ args.putParcelable(ARG_FILE, imageFile);
+ args.putBoolean(ARG_IGNORE_FIRST, ignoreFirstSavedState);
+ frag.setArguments(args);
+ return frag;
}
+
/**
* Creates an empty fragment for image previews.
*
- * MUST BE KEPT: the system uses it when tries to reinstantiate a fragment automatically (for instance, when the device is turned a aside).
+ * MUST BE KEPT: the system uses it when tries to reinstantiate a fragment automatically
+ * (for instance, when the device is turned a aside).
*
- * DO NOT CALL IT: an {@link OCFile} and {@link Account} must be provided for a successful construction
+ * DO NOT CALL IT: an {@link OCFile} and {@link Account} must be provided for a successful
+ * construction
*/
public PreviewImageFragment() {
- super();
- mAccount = null;
mIgnoreFirstSavedState = false;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ Bundle args = getArguments();
+ setFile((OCFile)args.getParcelable(ARG_FILE));
+ // TODO better in super, but needs to check ALL the class extending FileFragment;
+ // not right now
+
+ mIgnoreFirstSavedState = args.getBoolean(ARG_IGNORE_FIRST);
setHasOptionsMenu(true);
}
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
super.onCreateView(inflater, container, savedInstanceState);
- mView = inflater.inflate(R.layout.preview_image_fragment, container, false);
- mImageView = (TouchImageView) mView.findViewById(R.id.image);
+ View view = inflater.inflate(R.layout.preview_image_fragment, container, false);
+ mImageView = (TouchImageViewCustom) view.findViewById(R.id.image);
mImageView.setVisibility(View.GONE);
mImageView.setOnClickListener(new OnClickListener() {
@Override
}
});
- mMessageView = (TextView)mView.findViewById(R.id.message);
+ mMessageView = (TextView)view.findViewById(R.id.message);
mMessageView.setVisibility(View.GONE);
- mProgressWheel = (ProgressBar)mView.findViewById(R.id.progressWheel);
+ mProgressWheel = (ProgressBar)view.findViewById(R.id.progressWheel);
mProgressWheel.setVisibility(View.VISIBLE);
- return mView;
+ return view;
}
/**
super.onActivityCreated(savedInstanceState);
if (savedInstanceState != null) {
if (!mIgnoreFirstSavedState) {
- OCFile file = (OCFile)savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_FILE);
+ OCFile file = savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_FILE);
setFile(file);
- mAccount = savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_ACCOUNT);
} else {
mIgnoreFirstSavedState = false;
}
if (getFile() == null) {
throw new IllegalStateException("Instanced with a NULL OCFile");
}
- if (mAccount == null) {
- throw new IllegalStateException("Instanced with a NULL ownCloud Account");
- }
if (!getFile().isDown()) {
throw new IllegalStateException("There is no local file to preview");
}
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putParcelable(PreviewImageFragment.EXTRA_FILE, getFile());
- outState.putParcelable(PreviewImageFragment.EXTRA_ACCOUNT, mAccount);
}
public void onStart() {
super.onStart();
if (getFile() != null) {
- BitmapLoader bl = new BitmapLoader(mImageView, mMessageView, mProgressWheel);
- bl.execute(new String[]{getFile().getStoragePath()});
+ mLoadBitmapTask = new LoadBitmapTask(mImageView, mMessageView, mProgressWheel);
+ //mLoadBitmapTask.execute(new String[]{getFile().getStoragePath()});
+ mLoadBitmapTask.execute(getFile().getStoragePath());
}
}
+ @Override
+ public void onStop() {
+ Log_OC.d(TAG, "onStop starts");
+ if (mLoadBitmapTask != null) {
+ mLoadBitmapTask.cancel(true);
+ mLoadBitmapTask = null;
+ }
+ super.onStop();
+ }
+
/**
* {@inheritDoc}
*/
getFile(),
mContainerActivity.getStorageManager().getAccount(),
mContainerActivity,
- getSherlockActivity()
+ getActivity()
);
mf.filter(menu);
}
public void onDestroy() {
if (mBitmap != null) {
mBitmap.recycle();
+ System.gc();
+ // putting this in onStop() is just the same; the fragment is always destroyed by
+ // {@link FragmentStatePagerAdapter} when the fragment in swiped further than the
+ // valid offscreen distance, and onStop() is never called before than that
}
super.onDestroy();
}
}
- private class BitmapLoader extends AsyncTask<String, Void, Bitmap> {
+ private class LoadBitmapTask extends AsyncTask<String, Void, Bitmap> {
/**
* Weak reference to the target {@link ImageView} where the bitmap will be loaded into.
- *
- * Using a weak reference will avoid memory leaks if the target ImageView is retired from memory before the load finishes.
+ *
+ * Using a weak reference will avoid memory leaks if the target ImageView is retired from
+ * memory before the load finishes.
*/
- private final WeakReference<ImageView> mImageViewRef;
+ private final WeakReference<ImageViewCustom> mImageViewRef;
/**
* Weak reference to the target {@link TextView} where error messages will be written.
- *
- * Using a weak reference will avoid memory leaks if the target ImageView is retired from memory before the load finishes.
+ *
+ * Using a weak reference will avoid memory leaks if the target ImageView is retired from
+ * memory before the load finishes.
*/
private final WeakReference<TextView> mMessageViewRef;
/**
- * Weak reference to the target {@link Progressbar} shown while the load is in progress.
+ * Weak reference to the target {@link ProgressBar} shown while the load is in progress.
*
- * Using a weak reference will avoid memory leaks if the target ImageView is retired from memory before the load finishes.
+ * Using a weak reference will avoid memory leaks if the target ImageView is retired from
+ * memory before the load finishes.
*/
private final WeakReference<ProgressBar> mProgressWheelRef;
*
* @param imageView Target {@link ImageView} where the bitmap will be loaded into.
*/
- public BitmapLoader(ImageView imageView, TextView messageView, ProgressBar progressWheel) {
- mImageViewRef = new WeakReference<ImageView>(imageView);
+ public LoadBitmapTask(ImageViewCustom imageView, TextView messageView,
+ ProgressBar progressWheel) {
+ mImageViewRef = new WeakReference<ImageViewCustom>(imageView);
mMessageViewRef = new WeakReference<TextView>(messageView);
mProgressWheelRef = new WeakReference<ProgressBar>(progressWheel);
}
- @Override
+ @Override
protected Bitmap doInBackground(String... params) {
Bitmap result = null;
- if (params.length != 1) return result;
+ if (params.length != 1) return null;
String storagePath = params[0];
try {
- //Decode file into a bitmap in real size for being able to make zoom on the image
- result = BitmapFactory.decodeFile(storagePath);
- if (result == null) {
- mErrorMessageId = R.string.preview_image_error_unknown_format;
- Log_OC.e(TAG, "File could not be loaded as a bitmap: " + storagePath);
+ int maxDownScale = 3; // could be a parameter passed to doInBackground(...)
+ Point screenSize = DisplayUtils.getScreenSize(getActivity());
+ int minWidth = screenSize.x;
+ int minHeight = screenSize.y;
+ for (int i = 0; i < maxDownScale && result == null; i++) {
+ if (isCancelled()) return null;
+ try {
+ result = BitmapUtils.decodeSampledBitmapFromFile(storagePath, minWidth,
+ minHeight);
+
+ if (isCancelled()) return result;
+
+ if (result == null) {
+ mErrorMessageId = R.string.preview_image_error_unknown_format;
+ Log_OC.e(TAG, "File could not be loaded as a bitmap: " + storagePath);
+ break;
+ } else {
+ // Rotate image, obeying exif tag.
+ result = BitmapUtils.rotateImage(result, storagePath);
+ }
+
+ } catch (OutOfMemoryError e) {
+ mErrorMessageId = R.string.common_error_out_memory;
+ if (i < maxDownScale - 1) {
+ Log_OC.w(TAG, "Out of memory rendering file " + storagePath +
+ " ; scaling down");
+ minWidth = minWidth / 2;
+ minHeight = minHeight / 2;
+
+ } else {
+ Log_OC.w(TAG, "Out of memory rendering file " + storagePath +
+ " ; failing");
+ }
+ if (result != null) {
+ result.recycle();
+ }
+ result = null;
+ }
}
-
- } catch (OutOfMemoryError e) {
- mErrorMessageId = R.string.preview_image_error_unknown_format;
- Log_OC.e(TAG, "Out of memory occured for file " + storagePath, e);
-
+
} catch (NoSuchFieldError e) {
mErrorMessageId = R.string.common_error_unknown;
- Log_OC.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_OC.e(TAG, "Unexpected error loading " + getFile().getStoragePath(), t);
}
+
return result;
}
@Override
+ protected void onCancelled(Bitmap result) {
+ if (result != null) {
+ result.recycle();
+ }
+ }
+
+ @Override
protected void onPostExecute(Bitmap result) {
hideProgressWheel();
if (result != null) {
} else {
showErrorMessage();
}
+ if (result != null && mBitmap != result) {
+ // unused bitmap, release it! (just in case)
+ result.recycle();
+ }
}
+ @SuppressLint("InlinedApi")
private void showLoadedImage(Bitmap result) {
- if (mImageViewRef != null) {
- final ImageView imageView = mImageViewRef.get();
- if (imageView != null) {
- imageView.setImageBitmap(result);
- imageView.setVisibility(View.VISIBLE);
- mBitmap = result;
- } // else , silently finish, the fragment was destroyed
- }
- if (mMessageViewRef != null) {
- final TextView messageView = mMessageViewRef.get();
- if (messageView != null) {
- messageView.setVisibility(View.GONE);
- } // else , silently finish, the fragment was destroyed
+ final ImageViewCustom imageView = mImageViewRef.get();
+ if (imageView != null) {
+ Log_OC.d(TAG, "Showing image with resolution " + result.getWidth() + "x" +
+ result.getHeight());
+ imageView.setImageBitmap(result);
+ imageView.setVisibility(View.VISIBLE);
+ mBitmap = result; // needs to be kept for recycling when not useful
}
+
+ final TextView messageView = mMessageViewRef.get();
+ if (messageView != null) {
+ messageView.setVisibility(View.GONE);
+ } // else , silently finish, the fragment was destroyed
}
private void showErrorMessage() {
- if (mImageViewRef != null) {
- final ImageView imageView = mImageViewRef.get();
- if (imageView != null) {
- // shows the default error icon
- imageView.setVisibility(View.VISIBLE);
- } // else , silently finish, the fragment was destroyed
- }
- if (mMessageViewRef != null) {
- final TextView messageView = mMessageViewRef.get();
- if (messageView != null) {
- messageView.setText(mErrorMessageId);
- messageView.setVisibility(View.VISIBLE);
- } // else , silently finish, the fragment was destroyed
- }
+ final ImageView imageView = mImageViewRef.get();
+ if (imageView != null) {
+ // shows the default error icon
+ imageView.setVisibility(View.VISIBLE);
+ } // else , silently finish, the fragment was destroyed
+
+ final TextView messageView = mMessageViewRef.get();
+ if (messageView != null) {
+ messageView.setText(mErrorMessageId);
+ messageView.setVisibility(View.VISIBLE);
+ } // else , silently finish, the fragment was destroyed
}
private void hideProgressWheel() {
- if (mProgressWheelRef != null) {
- final ProgressBar progressWheel = mProgressWheelRef.get();
- if (progressWheel != null) {
- progressWheel.setVisibility(View.GONE);
- }
+ final ProgressBar progressWheel = mProgressWheelRef.get();
+ if (progressWheel != null) {
+ progressWheel.setVisibility(View.GONE);
}
}
}
/**
- * Helper method to test if an {@link OCFile} can be passed to a {@link PreviewImageFragment} to be previewed.
+ * Helper method to test if an {@link OCFile} can be passed to a {@link PreviewImageFragment}
+ * to be previewed.
*
* @param file File to test if can be previewed.
* @return 'True' if the file can be handled by the fragment.
container.finish();
}
- public TouchImageView getImageView() {
+ public TouchImageViewCustom getImageView() {
return mImageView;
}
-
+
}
projects / pub / Android / ownCloud.git / blobdiff