1 files changed, 9 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CryptoOperationFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CryptoOperationFragment.java
index b632509bb..f0a7859f7 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CryptoOperationFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CryptoOperationFragment.java
@@ -62,6 +62,11 @@ public abstract class CryptoOperationFragment extends Fragment {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == Activity.RESULT_CANCELED) {
+            onCryptoOperationCancelled();
+            return;
+        }
+
         switch (requestCode) {
             case REQUEST_CODE_PASSPHRASE: {
                 if (resultCode == Activity.RESULT_OK && data != null) {
@@ -116,4 +121,8 @@ public abstract class CryptoOperationFragment extends Fragment {
 
     protected abstract void cryptoOperation(CryptoInputParcel cryptoInput);
 
+    protected void onCryptoOperationCancelled() {
+        // Nothing to do here, in most cases
+    }
+
 }