Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 14:22:05 +01:00
Code Issues Releases Wiki Activity

Do not mask FileNotFoundException in FileBasedOpenPgpKeyStore

Browse source
This commit is contained in:
Florian Schmaus 2018-08-17 12:23:20 +02:00
parent fe9d2daed2
commit d133f25ca6
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpKeyStore.java
View file

@ -113,13 +113,10 @@ public class FileBasedOpenPgpKeyStore extends AbstractOpenPgpKeyStore {
public PGPPublicKeyRingCollection readPublicKeysOf(BareJid owner) public PGPPublicKeyRingCollection readPublicKeysOf(BareJid owner)
throws IOException, PGPException { throws IOException, PGPException {
File file = getPublicKeyRingPath(owner); File file = getPublicKeyRingPath(owner);
if (!file.exists()) {
FileInputStream inputStream;
try {
inputStream = FileUtils.prepareFileInputStream(file);
} catch (FileNotFoundException e) {
return null; return null;
} }
FileInputStream inputStream = FileUtils.prepareFileInputStream(file);
PGPPublicKeyRingCollection collection = PGPainless.readKeyRing().publicKeyRingCollection(inputStream); PGPPublicKeyRingCollection collection = PGPainless.readKeyRing().publicKeyRingCollection(inputStream);
inputStream.close(); inputStream.close();
@ -129,13 +126,10 @@ public class FileBasedOpenPgpKeyStore extends AbstractOpenPgpKeyStore {
@Override @Override
public PGPSecretKeyRingCollection readSecretKeysOf(BareJid owner) throws IOException, PGPException { public PGPSecretKeyRingCollection readSecretKeysOf(BareJid owner) throws IOException, PGPException {
File file = getSecretKeyRingPath(owner); File file = getSecretKeyRingPath(owner);
if (!file.exists()) {
FileInputStream inputStream;
try {
inputStream = FileUtils.prepareFileInputStream(file);
} catch (FileNotFoundException e) {
return null; return null;
} }
FileInputStream inputStream = FileUtils.prepareFileInputStream(file);
PGPSecretKeyRingCollection collection = PGPainless.readKeyRing().secretKeyRingCollection(inputStream); PGPSecretKeyRingCollection collection = PGPainless.readKeyRing().secretKeyRingCollection(inputStream);
inputStream.close(); inputStream.close();