aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-09-14 01:14:58 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-09-14 01:14:58 +0200
commit36ef8a9a62f32f0843c9e317d493a7f136624dce (patch)
tree7d139791b132f62397ad09d41b8b24cde0a436b7 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
parent03d103af0722540c0f636c139fac33d3ffb28a34 (diff)
downloadopen-keychain-36ef8a9a62f32f0843c9e317d493a7f136624dce.tar.gz
open-keychain-36ef8a9a62f32f0843c9e317d493a7f136624dce.tar.bz2
open-keychain-36ef8a9a62f32f0843c9e317d493a7f136624dce.zip
work on OperationResultParcel
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.java8
1 files changed, 4 insertions, 4 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 1b3bb06c3..4c94d25be 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
@@ -34,7 +34,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.results.OperationResultParcel;
+import org.sufficientlysecure.keychain.service.results.OperationResult;
import org.sufficientlysecure.keychain.service.results.ConsolidateResult;
import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.Notify;
@@ -166,7 +166,7 @@ public class KeyListActivity extends DrawerActivity {
return;
}
final ConsolidateResult result =
- returnData.getParcelable(OperationResultParcel.EXTRA_RESULT);
+ returnData.getParcelable(OperationResult.EXTRA_RESULT);
if (result == null) {
return;
}
@@ -201,8 +201,8 @@ public class KeyListActivity extends DrawerActivity {
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
// if a result has been returned, display a notify
- if (data != null && data.hasExtra(OperationResultParcel.EXTRA_RESULT)) {
- OperationResultParcel result = data.getParcelableExtra(OperationResultParcel.EXTRA_RESULT);
+ if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) {
+ OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT);
result.createNotify(this).show();
} else {
super.onActivityResult(requestCode, resultCode, data);