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

consistently use FileHelper.openInputStreamSafe to resolve input streams

Browse Source
This commit is contained in:
Vincent Breitmoser
2024-01-29 10:34:51 +01:00
parent 034eab9df1
commit ba9c93d046
8 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java
View File

@@ -57,6 +57,7 @@ import org.sufficientlysecure.keychain.service.BackupKeyringParcel;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.util.CountingOutputStream;
import org.sufficientlysecure.keychain.util.FileHelper;
import org.sufficientlysecure.keychain.util.InputData;
import org.sufficientlysecure.keychain.util.Numeric9x4PassphraseUtil;
import org.sufficientlysecure.keychain.util.Passphrase;
@@ -175,7 +176,7 @@ public class BackupOperation extends BaseOperation<BackupKeyringParcel> {
}
PgpSignEncryptData pgpSignEncryptData = builder.build();
InputStream inStream = mContext.getContentResolver().openInputStream(plainUri);
InputStream inStream = FileHelper.openInputStreamSafe(mContext.getContentResolver(), plainUri);
String filename;
long[] masterKeyIds = backupInput.getMasterKeyIds();

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
View File

@@ -55,6 +55,7 @@ import org.sufficientlysecure.keychain.provider.TemporaryFileProvider;
import org.sufficientlysecure.keychain.service.InputDataParcel;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
import org.sufficientlysecure.keychain.util.CharsetVerifier;
import org.sufficientlysecure.keychain.util.FileHelper;
/** This operation deals with input data, trying to determine its type as it goes.
@@ -381,7 +382,7 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> {
try {
// open current uri for input
InputStream in = mContext.getContentResolver().openInputStream(currentInputUri);
InputStream in = FileHelper.openInputStreamSafe(mContext.getContentResolver(), currentInputUri);
parser.parse(in);
if (mSignedDataUri != null) {
@@ -394,7 +395,7 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> {
// the actual content is the signed data now (and will be passed verbatim, if parsing fails)
currentInputUri = mSignedDataUri;
in = mContext.getContentResolver().openInputStream(currentInputUri);
in = FileHelper.openInputStreamSafe(mContext.getContentResolver(), currentInputUri);
// reset signed data result, to indicate to the parser that it is in the inner part
mSignedDataResult = null;
parser.parse(in);