aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.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/remote/ui/AppSettingsActivity.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/remote/ui/AppSettingsActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
index 8cc05231e..1c1978fe9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
@@ -32,7 +32,7 @@ import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.remote.AppSettings;
-import org.sufficientlysecure.keychain.service.results.OperationResultParcel;
+import org.sufficientlysecure.keychain.service.results.OperationResult;
import org.sufficientlysecure.keychain.util.Log;
public class AppSettingsActivity extends ActionBarActivity {
@@ -158,8 +158,8 @@ public class AppSettingsActivity extends ActionBarActivity {
@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);