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/KeychainNewService.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/KeychainNewService.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainNewService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainNewService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainNewService.java index 1a56b7083..080f6a38f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainNewService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainNewService.java @@ -113,6 +113,9 @@ public class KeychainNewService extends Service implements Progressable { || inputParcel instanceof ExportKeyringParcel){ op = new ImportExportOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled); + } else if (inputParcel instanceof ConsolidateInputParcel) { + op = new ConsolidateOperation(outerThis, new ProviderHelper(outerThis), + outerThis); } else { return; } |