* 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
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;
import android.view.ViewGroup;
import android.webkit.MimeTypeMap;
import android.widget.ImageView;
+import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import com.actionbarsherlock.view.MenuItem;
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.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.WebdavClient;
import eu.alefzero.webdav.WebdavUtils;
private FileDataStorageManager mStorageManager;
private ImageView mImageView;
private TextView mMessageView;
+ private ProgressBar mProgressWheel;
public Bitmap mBitmap = null;
super.onCreateView(inflater, container, savedInstanceState);
mView = inflater.inflate(R.layout.preview_image_fragment, container, false);
mImageView = (ImageView)mView.findViewById(R.id.image);
+ mImageView.setVisibility(View.GONE);
mView.setOnTouchListener((OnTouchListener)getActivity()); // WATCH OUT THAT CAST
mMessageView = (TextView)mView.findViewById(R.id.message);
mMessageView.setVisibility(View.GONE);
+ mProgressWheel = (ProgressBar)mView.findViewById(R.id.progressWheel);
+ mProgressWheel.setVisibility(View.VISIBLE);
return mView;
}
public void onStart() {
super.onStart();
if (mFile != null) {
- BitmapLoader bl = new BitmapLoader(mImageView, mMessageView);
+ BitmapLoader bl = new BitmapLoader(mImageView, mMessageView, mProgressWheel);
bl.execute(new String[]{mFile.getStoragePath()});
}
}
@Override
public void onResume() {
super.onResume();
- Log.e(TAG, "FRAGMENT, ONRESUME");
+ //Log.e(TAG, "FRAGMENT, ONRESUME");
/*
mDownloadFinishReceiver = new DownloadFinishReceiver();
IntentFilter filter = new IntentFilter(
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: " + mFile.getMimetype());
boolean toastIt = true;
String mimeType = "";
try {
}
} 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) {
mLastRemoteOperation = new RemoveFileOperation( mFile, // 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);
}
private final WeakReference<TextView> mMessageViewRef;
- private Throwable mThrowable;
+ /**
+ * 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.
+ */
+ private final WeakReference<ProgressBar> mProgressWheelRef;
+
+
+ /**
+ * Error message to show when a load fails
+ */
+ private int mErrorMessageId;
/**
*
* @param imageView Target {@link ImageView} where the bitmap will be loaded into.
*/
- public BitmapLoader(ImageView imageView, TextView messageView) {
+ public BitmapLoader(ImageView imageView, TextView messageView, ProgressBar progressWheel) {
mImageViewRef = new WeakReference<ImageView>(imageView);
mMessageViewRef = new WeakReference<TextView>(messageView);
- mThrowable = null;
+ mProgressWheelRef = new WeakReference<ProgressBar>(progressWheel);
}
int height = options.outHeight;
int scale = 1;
- /*
- if (width >= 2048 || height >= 2048) {
- // try to scale down the image to save memory
- scale = (int) Math.ceil((Math.ceil(Math.max(height, width) / 2048.)));
- options.inSampleSize = scale;
- }
- */
-
Display display = getActivity().getWindowManager().getDefaultDisplay();
Point size = new Point();
int screenWidth;
}
if (width > screenWidth) {
- // second try to scale down the image , this time depending upon the screen size; WTF...
- scale = (int) Math.ceil((float)width / screenWidth);
- options.inSampleSize = scale;
+ // second try to scale down the image , this time depending upon the screen size
+ scale = (int) Math.floor((float)width / screenWidth);
}
if (height > screenHeight) {
- scale = Math.max(scale, (int) Math.ceil((float)height / screenHeight));
+ scale = Math.max(scale, (int) Math.floor((float)height / screenHeight));
}
-
+ options.inSampleSize = scale;
// 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_OC.e(TAG, "File could not be loaded as a bitmap: " + storagePath);
+ }
+
+ } 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);
+
} catch (Throwable t) {
- result = null;
- mThrowable = t; // error processing is delayed to #onPostExecute(Bitmap)
- Log.e(TAG, "Unexpected error while creating image preview " + storagePath, t);
+ mErrorMessageId = R.string.common_error_unknown;
+ Log_OC.e(TAG, "Unexpected error loading " + mFile.getStoragePath(), t);
+
}
return result;
}
@Override
protected void onPostExecute(Bitmap result) {
- if (mImageViewRef != null && result != null) {
+ hideProgressWheel();
+ if (result != null) {
+ showLoadedImage(result);
+ } else {
+ showErrorMessage();
+ }
+ }
+
+ 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;
- if (mMessageViewRef != null) {
- final TextView messageView = mMessageViewRef.get();
- if (messageView != null) {
- messageView.setVisibility(View.GONE);
- }
- }
} // else , silently finish, the fragment was destroyed
-
- } else if (mMessageViewRef != null && result == null) {
- // error
- int messageId;
- if (mThrowable == null) {
- messageId = R.string.preview_image_error_unknown_format;
- Log.e(TAG, "File could not be loaded as a bitmap: " + mFile.getStoragePath());
-
- } else if (mThrowable instanceof OutOfMemoryError) {
- messageId = R.string.preview_image_error_unknown_format;
- Log.e(TAG, "Out of memory occured for file " + mFile.getStoragePath(), mThrowable);
-
- } else if (mThrowable instanceof NoSuchFieldError) {
- messageId = R.string.common_error_unknown;
- Log.e(TAG, "Error from access to unexisting field despite protection; file " + mFile.getStoragePath(), mThrowable);
-
- } else {
- messageId = R.string.common_error_unknown;
- Log.e(TAG, "Unexpected error loading " + mFile.getStoragePath(), mThrowable);
- }
+ }
+ if (mMessageViewRef != null) {
+ 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(messageId);
+ 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);
+ }
+ }
}
}
projects / pub / Android / ownCloud.git / blobdiff