diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 21:48:01 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 21:48:01 +0200 |
| commit | 53680b621320512b44e961f0453043a31c40dfee (patch) | |
| tree | feff220dd5a59f2e89e4e89e8a7488e25bc767da /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java | |
| parent | 52c6d8f8e03ab0047f5e8ed6f46273ac24a87205 (diff) | |
| download | open-keychain-53680b621320512b44e961f0453043a31c40dfee.tar.gz open-keychain-53680b621320512b44e961f0453043a31c40dfee.tar.bz2 open-keychain-53680b621320512b44e961f0453043a31c40dfee.zip | |
Cleanup, fix advanced sharing
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 | 6 |
1 files changed, 3 insertions, 3 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 981a76203..ee953b060 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java @@ -33,7 +33,7 @@ import org.sufficientlysecure.keychain.operations.CertifyOperation; import org.sufficientlysecure.keychain.operations.ConsolidateOperation; import org.sufficientlysecure.keychain.operations.DeleteOperation; import org.sufficientlysecure.keychain.operations.EditKeyOperation; -import org.sufficientlysecure.keychain.operations.ExportOperation; +import org.sufficientlysecure.keychain.operations.BackupOperation; import org.sufficientlysecure.keychain.operations.ImportOperation; import org.sufficientlysecure.keychain.operations.KeybaseVerificationOperation; import org.sufficientlysecure.keychain.operations.InputDataOperation; @@ -125,8 +125,8 @@ public class KeychainService extends Service implements Progressable { op = new PromoteKeyOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled); } else if (inputParcel instanceof ImportKeyringParcel) { 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 BackupKeyringParcel) { + op = new BackupOperation(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) { |