TouchInstinct
/
android-crop
300
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70 from alexblack/google-drive-fix 

Fallback to support getting images from Google Drive
This commit is contained in:
Jamie McDonald 2015-02-13 13:37:34 +01:00
parent 69e238a449 de1373d609
commit 3409351b77
2 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
View File

@ -122,7 +122,7 @@ public class CropImageActivity extends MonitoredActivity {
sourceUri = intent.getData();
if (sourceUri != null) {
exifRotation = CropUtil.getExifRotation(CropUtil.getFromMediaUri(getContentResolver(), sourceUri));
exifRotation = CropUtil.getExifRotation(CropUtil.getFromMediaUri(this, getContentResolver(), sourceUri));
InputStream is = null;
try {
@ -421,8 +421,8 @@ public class CropImageActivity extends MonitoredActivity {
if (!IN_MEMORY_CROP) {
// In-memory crop negates the rotation
CropUtil.copyExifRotation(
CropUtil.getFromMediaUri(getContentResolver(), sourceUri),
CropUtil.getFromMediaUri(getContentResolver(), saveUri)
CropUtil.getFromMediaUri(this, getContentResolver(), sourceUri),
CropUtil.getFromMediaUri(this, getContentResolver(), saveUri)
);
}

45
lib/src/main/java/com/soundcloud/android/crop/CropUtil.java
View File

@ -18,15 +18,21 @@ package com.soundcloud.android.crop;
import android.app.ProgressDialog;
import android.content.ContentResolver;
import android.content.Context;
import android.database.Cursor;
import android.media.ExifInterface;
import android.net.Uri;
import android.os.Handler;
import android.os.ParcelFileDescriptor;
import android.provider.MediaStore;
import android.text.TextUtils;
import java.io.Closeable;
import java.io.File;
import java.io.FileDescriptor;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
/*
@ -81,7 +87,7 @@ class CropUtil {
}
}
public static File getFromMediaUri(ContentResolver resolver, Uri uri) {
public static File getFromMediaUri(Context context, ContentResolver resolver, Uri uri) {
if (uri == null) return null;
if (SCHEME_FILE.equals(uri.getScheme())) {
@ -103,6 +109,9 @@ class CropUtil {
}
}
}
} catch (IllegalArgumentException ignored) {
// See: https://github.com/jdamcd/android-crop/issues/47
return getFromMediaUriPfd(context, resolver, uri);
} catch (SecurityException ignored) {
// Nothing we can do
} finally {
@ -112,6 +121,40 @@ class CropUtil {
return null;
}
private static String getTempFilename(Context context) throws IOException {
File outputDir = context.getCacheDir(); // context being the Activity pointer
File outputFile = File.createTempFile("image", "tmp", outputDir);
return outputFile.getAbsolutePath();
}
private static File getFromMediaUriPfd(Context context, ContentResolver resolver, Uri uri) {
if (uri == null) return null;
FileInputStream input = null;
FileOutputStream output = null;
try {
ParcelFileDescriptor pfd = resolver.openFileDescriptor(uri, "r");
FileDescriptor fd = pfd.getFileDescriptor();
input = new FileInputStream(fd);
String tempFilename = getTempFilename(context);
output = new FileOutputStream(tempFilename);
int read = 0;
byte[] bytes = new byte[4096];
while ((read = input.read(bytes)) != -1) {
output.write(bytes, 0, read);
}
return new File(tempFilename);
} catch (IOException ignored) {
// nothing we can do
} finally {
if (input != null) try { input.close(); } catch(Exception ignored) {}
if (output != null) try { output.close(); } catch(Exception ignored) {}
}
return null;
}
public static void startBackgroundJob(MonitoredActivity activity,
String title, String message, Runnable job, Handler handler) {
// Make the progress dialog uncancelable, so that we can gurantee