diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-26 03:20:39 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-26 03:21:53 +0200 |
| commit | c93670f3c6af3bc27b531a2501fc82e9a759ddc0 (patch) | |
| tree | 111963e2970f25f7231885e1c7ccc8b230cf629f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java | |
| parent | 603eab729fcd76fb6c5324063affd4de9cbe8984 (diff) | |
| download | open-keychain-c93670f3c6af3bc27b531a2501fc82e9a759ddc0.tar.gz open-keychain-c93670f3c6af3bc27b531a2501fc82e9a759ddc0.tar.bz2 open-keychain-c93670f3c6af3bc27b531a2501fc82e9a759ddc0.zip | |
export: externalize upload into its own operation
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java index c7ac92eef..981a76203 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java @@ -40,6 +40,7 @@ import org.sufficientlysecure.keychain.operations.InputDataOperation; import org.sufficientlysecure.keychain.operations.PromoteKeyOperation; import org.sufficientlysecure.keychain.operations.RevokeOperation; import org.sufficientlysecure.keychain.operations.SignEncryptOperation; +import org.sufficientlysecure.keychain.operations.UploadOperation; import org.sufficientlysecure.keychain.operations.results.OperationResult; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyOperation; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyInputParcel; @@ -126,6 +127,8 @@ public class KeychainService extends Service implements Progressable { op = new ImportOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled); } else if (inputParcel instanceof ExportKeyringParcel) { op = new ExportOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled); + } else if (inputParcel instanceof UploadKeyringParcel) { + op = new UploadOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled); } else if (inputParcel instanceof ConsolidateInputParcel) { op = new ConsolidateOperation(outerThis, new ProviderHelper(outerThis), outerThis); } else if (inputParcel instanceof KeybaseVerificationParcel) { |