diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-10 02:31:17 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-13 23:34:06 +0530 |
commit | cdd9de99bf4b1c9d7a808faed7795fc2a14e7809 (patch) | |
tree | 2d03aaca6bc14181b1c0bd2f30e32f4a9557d74f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ExportOperation.java | |
parent | faa66d6140e7f68d920e612c21fa01139b12170e (diff) | |
download | open-keychain-cdd9de99bf4b1c9d7a808faed7795fc2a14e7809.tar.gz open-keychain-cdd9de99bf4b1c9d7a808faed7795fc2a14e7809.tar.bz2 open-keychain-cdd9de99bf4b1c9d7a808faed7795fc2a14e7809.zip |
allowed operations to modify CryptoInputParcel they receive
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ExportOperation.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ExportOperation.java | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ExportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ExportOperation.java index 0dec35949..5b13fa629 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ExportOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ExportOperation.java @@ -130,18 +130,6 @@ public class ExportOperation extends BaseOperation<ExportKeyringParcel> { } } - /** - * returns null if no user input required for upload, an InputPendingResult otherwise - */ - @Nullable - public InputPendingResult getUploadPendingInput() { - if (!OrbotHelper.isOrbotInRequiredState(mContext)) { - return new ExportResult(null, - RequiredInputParcel.createOrbotRequiredOperation()); - } - return null; - } - public ExportResult exportToFile(long[] masterKeyIds, boolean exportSecret, String outputFile) { OperationLog log = new OperationLog(); @@ -355,7 +343,7 @@ public class ExportOperation extends BaseOperation<ExportKeyringParcel> { // explicit proxy not set if (!OrbotHelper.isOrbotInRequiredState(mContext)) { return new ExportResult(null, - RequiredInputParcel.createOrbotRequiredOperation()); + RequiredInputParcel.createOrbotRequiredOperation(), cryptoInput); } proxy = Preferences.getPreferences(mContext).getProxyPrefs() .parcelableProxy.getProxy(); |