diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-24 03:51:53 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-27 01:20:23 +0530 |
| commit | b33004a2f599d34035c0b49dff75cf00a21adb7e (patch) | |
| tree | 238b8c619106219ddc79bf8777cfcc35b3712e50 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java | |
| parent | 6f3be84c43365b081040e8cefc571fa3db0550aa (diff) | |
| download | open-keychain-b33004a2f599d34035c0b49dff75cf00a21adb7e.tar.gz open-keychain-b33004a2f599d34035c0b49dff75cf00a21adb7e.tar.bz2 open-keychain-b33004a2f599d34035c0b49dff75cf00a21adb7e.zip | |
migrated consolidation
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 | 20 |
1 files changed, 1 insertions, 19 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 c9d82951b..127719ab7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java @@ -37,10 +37,7 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.keyimport.HkpKeyserver; import org.sufficientlysecure.keychain.keyimport.Keyserver; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; -import org.sufficientlysecure.keychain.operations.DeleteOperation; -import org.sufficientlysecure.keychain.operations.EditKeyOperation; -import org.sufficientlysecure.keychain.operations.ImportExportOperation; -import org.sufficientlysecure.keychain.operations.PromoteKeyOperation; +import org.sufficientlysecure.keychain.operations.*; import org.sufficientlysecure.keychain.operations.results.ConsolidateResult; import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult; import org.sufficientlysecure.keychain.operations.results.DeleteResult; @@ -157,21 +154,6 @@ public class KeychainService extends Service implements Progressable { // executeServiceMethod action from extra bundle switch (action) { - case ACTION_CONSOLIDATE: { - - // Operation - ConsolidateResult result; - if (data.containsKey(CONSOLIDATE_RECOVERY) && data.getBoolean(CONSOLIDATE_RECOVERY)) { - result = providerHelper.consolidateDatabaseStep2(KeychainService.this); - } else { - result = providerHelper.consolidateDatabaseStep1(KeychainService.this); - } - - // Result - sendMessageToHandler(MessageStatus.OKAY, result); - - break; - } case ACTION_VERIFY_KEYBASE_PROOF: { try { |