mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Switch to using UIL for Share activity as well

Browse source 
Should fix the OOM issues and be in general more reliable
This commit is contained in:
YuviPanda 2013-02-27 16:14:08 +05:30
parent 9aebac8c23
commit 629f222ccb
2 changed files with 2 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

107
commons/src/main/java/org/wikimedia/commons/ImageLoaderTask.java
View file

@ -1,107 +0,0 @@
package org.wikimedia.commons;
import java.net.*;
import java.io.*;
import android.content.Context;
import android.database.Cursor;
import android.graphics.*;
import android.net.Uri;
import android.os.*;
import android.provider.MediaStore;
import android.util.Log;
import android.view.WindowManager;
import android.widget.*;
public class ImageLoaderTask extends AsyncTask<Uri, String, Bitmap> {
ImageView view;
public int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
// Raw height and width of image
final int height = options.outHeight;
final int width = options.outWidth;
int inSampleSize = 1;
if (height > reqHeight || width > reqWidth) {
if (width > height) {
inSampleSize = Math.round((float) height / (float) reqHeight);
} else {
inSampleSize = Math.round((float) width / (float) reqWidth);
}
}
return inSampleSize;
}
private int getOrientation(Uri photoUri) {
/* it's on the external media. */
Cursor cursor = view.getContext().getContentResolver().query(photoUri,
new String[] { MediaStore.Images.ImageColumns.ORIENTATION }, null, null, null);
if (cursor == null || cursor.getCount() != 1) {
return 0;
}
cursor.moveToFirst();
return cursor.getInt(0);
}
public Bitmap getBitmap(Uri imageUri) throws FileNotFoundException {
// FIXME: Use proper window width, not device width. But should do for now!
WindowManager wm = (WindowManager) view.getContext().getSystemService(Context.WINDOW_SERVICE);
int reqHeight = wm.getDefaultDisplay().getHeight();
int reqWidth = wm.getDefaultDisplay().getWidth();
int orientation = getOrientation(imageUri);
if(orientation == 90 || orientation == 270) {
// Swap height and width if this is rotated
int temp = reqHeight;
reqHeight = reqWidth;
reqWidth = temp;
}
// First decode with inJustDecodeBounds=true to check dimensions
final BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true;
InputStream bitmapStream = view.getContext().getContentResolver().openInputStream(imageUri);
BitmapFactory.decodeStream(bitmapStream, null, options);
// Calculate inSampleSize
options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight);
// Decode bitmap with inSampleSize set
options.inJustDecodeBounds = false;
// Re-get the InputStream!
bitmapStream = view.getContext().getContentResolver().openInputStream(imageUri);
Bitmap bitmap = BitmapFactory.decodeStream(bitmapStream, null, options);
Matrix matrix = new Matrix();
matrix.postRotate(orientation);
return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
}
public ImageLoaderTask(ImageView view) {
this.view = view;
}
@Override
protected Bitmap doInBackground(Uri... params) {
Uri url = params[0];
Bitmap bitmap;
try {
bitmap = getBitmap(url);
} catch (IOException e) {
throw new RuntimeException(e);
}
return bitmap;
}
@Override
protected void onPostExecute(Bitmap result) {
super.onPostExecute(result);
view.setImageBitmap(result);
}
}

4
commons/src/main/java/org/wikimedia/commons/ShareActivity.java
View file

@ -9,6 +9,7 @@ import android.provider.MediaStore;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.Log; import android.util.Log;
import com.nostra13.universalimageloader.core.ImageLoader;
import org.wikimedia.commons.auth.AuthenticatedActivity; import org.wikimedia.commons.auth.AuthenticatedActivity;
import org.wikimedia.commons.auth.WikiAccountAuthenticator; import org.wikimedia.commons.auth.WikiAccountAuthenticator;
@ -139,8 +140,7 @@ public class ShareActivity extends AuthenticatedActivity {
mimeType = intent.getType(); mimeType = intent.getType();
if(mimeType.startsWith("image/")) { if(mimeType.startsWith("image/")) {
ImageLoaderTask loader = new ImageLoaderTask(backgroundImageView); ImageLoader.getInstance().displayImage(mediaUri.toString(), backgroundImageView);
loader.execute(mediaUri);
} }
Intent uploadServiceIntent = new Intent(getApplicationContext(), UploadService.class); Intent uploadServiceIntent = new Intent(getApplicationContext(), UploadService.class);