aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-07-08 03:12:24 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-07-08 03:12:24 +0200
commit4837d4cc5c86a5f5f18cb86300f165cf1b37f4d2 (patch)
treefeeaaa654f24df80453e69a43cff84770c95fd27 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
parent15cee8e7e995afe1c435004c3abba521439e4e0b (diff)
parentaf546ae10190ac076cd7b091cd064fb8a5c03519 (diff)
downloadopen-keychain-4837d4cc5c86a5f5f18cb86300f165cf1b37f4d2.tar.gz
open-keychain-4837d4cc5c86a5f5f18cb86300f165cf1b37f4d2.tar.bz2
open-keychain-4837d4cc5c86a5f5f18cb86300f165cf1b37f4d2.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
index ab631c6fe..467eab785 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
@@ -324,16 +324,15 @@ public class CertifyKeyFragment
}
@Override
- public void onCryptoOperationSuccess(CertifyResult result) {
+ public void onQueuedOperationSuccess(CertifyResult result) {
+ // protected by Queueing*Fragment
+ Activity activity = getActivity();
+
Intent intent = new Intent();
intent.putExtra(CertifyResult.EXTRA_RESULT, result);
- getActivity().setResult(Activity.RESULT_OK, intent);
- getActivity().finish();
- }
+ activity.setResult(Activity.RESULT_OK, intent);
+ activity.finish();
- @Override
- public void onCryptoOperationCancelled() {
- super.onCryptoOperationCancelled();
}
}