aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-08-20 19:34:36 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-08-20 19:34:36 +0200
commitfe1f5489ff8e819c8711f9bde3a19573bc621110 (patch)
tree8754f34ea06cfa0c1b6d94b4bbc1f09d0f2e5d64 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
parent9aaaac068efa21c4f9fdc8ae9c79abdee685b0fc (diff)
downloadopen-keychain-fe1f5489ff8e819c8711f9bde3a19573bc621110.tar.gz
open-keychain-fe1f5489ff8e819c8711f9bde3a19573bc621110.tar.bz2
open-keychain-fe1f5489ff8e819c8711f9bde3a19573bc621110.zip
consolidate: implement (mostly) recovery mode
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
index 9d9462648..0bc98d545 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
@@ -33,6 +33,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.KeychainDatabase;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.service.OperationResultParcel;
import org.sufficientlysecure.keychain.service.OperationResults.ConsolidateResult;
import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.Notify;
@@ -164,7 +165,7 @@ public class KeyListActivity extends DrawerActivity {
return;
}
final ConsolidateResult result =
- returnData.getParcelable(KeychainIntentService.RESULT_CONSOLIDATE);
+ returnData.getParcelable(OperationResultParcel.EXTRA_RESULT);
if (result == null) {
return;
}