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/operations | |
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/operations')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ExportOperation.java) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ExportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java index 5f77a3224..8f383cd3a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ExportOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java @@ -55,7 +55,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.provider.TemporaryFileProvider; -import org.sufficientlysecure.keychain.service.ExportKeyringParcel; +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.InputData; @@ -72,7 +72,7 @@ import org.sufficientlysecure.keychain.util.Log; * For the export operation, the input consists of a set of key ids and * either the name of a file or an output uri to write to. */ -public class ExportOperation extends BaseOperation<ExportKeyringParcel> { +public class BackupOperation extends BaseOperation<BackupKeyringParcel> { private static final String[] PROJECTION = new String[] { KeyRings.MASTER_KEY_ID, @@ -85,18 +85,18 @@ public class ExportOperation extends BaseOperation<ExportKeyringParcel> { private static final int INDEX_SECKEY_DATA = 2; private static final int INDEX_HAS_ANY_SECRET = 3; - public ExportOperation(Context context, ProviderHelper providerHelper, Progressable + public BackupOperation(Context context, ProviderHelper providerHelper, Progressable progressable) { super(context, providerHelper, progressable); } - public ExportOperation(Context context, ProviderHelper providerHelper, + public BackupOperation(Context context, ProviderHelper providerHelper, Progressable progressable, AtomicBoolean cancelled) { super(context, providerHelper, progressable, cancelled); } @NonNull - public ExportResult execute(@NonNull ExportKeyringParcel exportInput, @Nullable CryptoInputParcel cryptoInput) { + public ExportResult execute(@NonNull BackupKeyringParcel exportInput, @Nullable CryptoInputParcel cryptoInput) { OperationLog log = new OperationLog(); if (exportInput.mMasterKeyIds != null) { |