diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-06 11:27:57 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-06 11:27:57 +0200 |
| commit | 801566bdb11d5edac45680037ada16b51922ba18 (patch) | |
| tree | 3b52980b4af3ec90c624f07292c27c9bbd6692be /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/DeleteOperation.java | |
| parent | baf059843ef51c57e47cd74fa695485b93482669 (diff) | |
| parent | 7648602fc876df3ec5827f3bba1ebbb8ae92eaae (diff) | |
| download | open-keychain-801566bdb11d5edac45680037ada16b51922ba18.tar.gz open-keychain-801566bdb11d5edac45680037ada16b51922ba18.tar.bz2 open-keychain-801566bdb11d5edac45680037ada16b51922ba18.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/DeleteOperation.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/DeleteOperation.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/DeleteOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/DeleteOperation.java index 50b2ef69b..ac4a0da11 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/DeleteOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/DeleteOperation.java @@ -18,6 +18,7 @@ package org.sufficientlysecure.keychain.operations; import android.content.Context; +import android.support.annotation.NonNull; import org.sufficientlysecure.keychain.operations.results.ConsolidateResult; import org.sufficientlysecure.keychain.operations.results.DeleteResult; @@ -45,6 +46,7 @@ public class DeleteOperation extends BaseOperation<DeleteKeyringParcel> { super(context, providerHelper, progressable); } + @NonNull @Override public DeleteResult execute(DeleteKeyringParcel deleteKeyringParcel, CryptoInputParcel cryptoInputParcel) { |