cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consolidate on database upgrade

Browse Source
This commit is contained in:
Dominik Schürmann
2014-09-09 09:26:03 +02:00
parent c344158c37
commit 7c67f7a715
7 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileImportCache.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableFileCache.java
View File

@@ -29,6 +29,7 @@ import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
@@ -42,13 +43,13 @@ import java.util.List;
* To overcome this problem, we cache large Parcelables into a file in our private cache directory
* instead of sending them through IPC.
*/
public class FileImportCache<E extends Parcelable> {
public class ParcelableFileCache<E extends Parcelable> {
private Context mContext;
private final String mFilename;
public FileImportCache(Context context, String filename) {
public ParcelableFileCache(Context context, String filename) {
mContext = context;
mFilename = filename;
}
@@ -104,7 +105,13 @@ public class FileImportCache<E extends Parcelable> {
}
final File tempFile = new File(cacheDir, mFilename);
final DataInputStream ois = new DataInputStream(new FileInputStream(tempFile));
final DataInputStream ois;
try {
ois = new DataInputStream(new FileInputStream(tempFile));
} catch (FileNotFoundException e) {
Log.e(Constants.TAG, "parcel import file not existing", e);
throw new IOException(e);
}
return new Iterator<E>() {