moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-24 02:12:15 -05:00
Code Issues Releases Wiki Activity

Reverted the revered version of AttachmentProvider so that people who used the attachment on sd card can still get to their attachments

Browse Source
This commit is contained in:
Bao-Long Nguyen-Trong 2010-02-20 20:15:21 +00:00
parent ec3d9eb9ea
commit 6b5ea9feda
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/fsck/k9/provider/AttachmentProvider.java
View File

@ -9,6 +9,7 @@ import android.database.sqlite.SQLiteDatabase;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.net.Uri; import android.net.Uri;
import android.os.Environment;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.util.Log; import android.util.Log;
import com.fsck.k9.Account; import com.fsck.k9.Account;
@ -156,6 +157,29 @@ public class AttachmentProvider extends ContentProvider
} }
} }
private File getFile(String dbName, String id)
throws FileNotFoundException
{
try
{
File attachmentsDir = getContext().getDatabasePath(dbName + "_att");
File file = new File(attachmentsDir, id);
if (!file.exists())
{
file = new File("/sdcard" + attachmentsDir.getCanonicalPath().substring("/data".length()), id);
if (!file.exists()) {
throw new FileNotFoundException();
}
}
return file;
}
catch (IOException e)
{
Log.w(K9.LOG_TAG, null, e);
throw new FileNotFoundException(e.getMessage());
}
}
@Override @Override
public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException
{ {
@ -176,10 +200,9 @@ public class AttachmentProvider extends ContentProvider
String type = getType(attachmentUri); String type = getType(attachmentUri);
try try
{ {
FileInputStream in = new FileInputStream( FileInputStream in = new FileInputStream(getFile(dbName, id));
new File(getContext().getDatabasePath(dbName + "_att"), id));
Bitmap thumbnail = createThumbnail(type, in); Bitmap thumbnail = createThumbnail(type, in);
thumbnail = thumbnail.createScaledBitmap(thumbnail, width, height, true); thumbnail = Bitmap.createScaledBitmap(thumbnail, width, height, true);
FileOutputStream out = new FileOutputStream(file); FileOutputStream out = new FileOutputStream(file);
thumbnail.compress(Bitmap.CompressFormat.PNG, 100, out); thumbnail.compress(Bitmap.CompressFormat.PNG, 100, out);
out.close(); out.close();
@ -195,7 +218,7 @@ public class AttachmentProvider extends ContentProvider
else else
{ {
return ParcelFileDescriptor.open( return ParcelFileDescriptor.open(
new File(getContext().getDatabasePath(dbName + "_att"), id), getFile(dbName, id),
ParcelFileDescriptor.MODE_READ_ONLY); ParcelFileDescriptor.MODE_READ_ONLY);
} }
} }