moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-11 11:35:07 -05:00
Code Issues Releases Wiki Activity

Remove support for IO_FILE, this is no longer used and was never a good practice, use IO_URI on Android!

Browse Source
This commit is contained in:
Dominik Schürmann 2014-08-04 14:44:11 +02:00
parent 839294d27c
commit c4311e2f52
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
View File

@ -110,9 +110,8 @@ public class KeychainIntentService extends IntentService
public static final String SOURCE = "source"; public static final String SOURCE = "source";
// possible targets: // possible targets:
public static final int IO_BYTES = 1; public static final int IO_BYTES = 1;
public static final int IO_FILE = 2; // This was misleadingly TARGET_URI before! public static final int IO_URI = 2;
public static final int IO_URI = 3; public static final int IO_URIS = 3;
public static final int IO_URIS = 4;
public static final String SELECTED_URI = "selected_uri"; public static final String SELECTED_URI = "selected_uri";
@ -716,16 +715,6 @@ public class KeychainIntentService extends IntentService
byte[] bytes = data.getByteArray(bytesName); byte[] bytes = data.getByteArray(bytesName);
return new InputData(new ByteArrayInputStream(bytes), bytes.length); return new InputData(new ByteArrayInputStream(bytes), bytes.length);
case IO_FILE: /* encrypting file */
String inputFile = data.getString(ENCRYPT_INPUT_FILE);
// check if storage is ready
if (!FileHelper.isStorageMounted(inputFile)) {
throw new PgpGeneralException(getString(R.string.error_external_storage_not_ready));
}
return new InputData(new FileInputStream(inputFile), new File(inputFile).length());
case IO_URI: /* encrypting content uri */ case IO_URI: /* encrypting content uri */
Uri providerUri = data.getParcelable(ENCRYPT_INPUT_URI); Uri providerUri = data.getParcelable(ENCRYPT_INPUT_URI);
@ -749,18 +738,6 @@ public class KeychainIntentService extends IntentService
case IO_BYTES: case IO_BYTES:
return new ByteArrayOutputStream(); return new ByteArrayOutputStream();
case IO_FILE:
String outputFile = data.getString(ENCRYPT_OUTPUT_FILE);
// check if storage is ready
if (!FileHelper.isStorageMounted(outputFile)) {
throw new PgpGeneralException(
getString(R.string.error_external_storage_not_ready));
}
// OutputStream
return new FileOutputStream(outputFile);
case IO_URI: case IO_URI:
Uri providerUri = data.getParcelable(ENCRYPT_OUTPUT_URI); Uri providerUri = data.getParcelable(ENCRYPT_OUTPUT_URI);
@ -790,10 +767,6 @@ public class KeychainIntentService extends IntentService
case IO_BYTES: case IO_BYTES:
byte output[] = ((ByteArrayOutputStream) outStream).toByteArray(); byte output[] = ((ByteArrayOutputStream) outStream).toByteArray();
resultData.putByteArray(bytesName, output); resultData.putByteArray(bytesName, output);
break;
case IO_FILE:
// nothing, file was written, just send okay and verification bundle
break; break;
case IO_URI: case IO_URI:
case IO_URIS: case IO_URIS: