diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-17 21:33:31 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-17 21:33:31 +0200 |
commit | 7f3154eceaf164e702b3c471e4dd25409b330d35 (patch) | |
tree | 10a603ed93e86b2c74c28542855a36224fd4e26a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider | |
parent | 374b21410e82877efcdd1e5110376e975bddbf9f (diff) | |
parent | f5aa36ef9f092240f99cb64b83cc64b91544d638 (diff) | |
download | open-keychain-7f3154eceaf164e702b3c471e4dd25409b330d35.tar.gz open-keychain-7f3154eceaf164e702b3c471e4dd25409b330d35.tar.bz2 open-keychain-7f3154eceaf164e702b3c471e4dd25409b330d35.zip |
Merge branch 'master' into v/multi-decrypt
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java index 36ba47672..a91eca453 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java @@ -391,10 +391,15 @@ public class KeychainDatabase extends SQLiteOpenHelper { private static void copy(File in, File out) throws IOException { FileInputStream is = new FileInputStream(in); FileOutputStream os = new FileOutputStream(out); - byte[] buf = new byte[512]; - while (is.available() > 0) { - int count = is.read(buf, 0, 512); - os.write(buf, 0, count); + try { + byte[] buf = new byte[512]; + while (is.available() > 0) { + int count = is.read(buf, 0, 512); + os.write(buf, 0, count); + } + } finally { + is.close(); + os.close(); } } |