1 files changed, 4 insertions, 0 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
index 13e8704b..05b87b98 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -394,6 +394,10 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         Log.d(Constants.TAG, "onActivityResult resultCode: " + resultCode);
+        if (data == null) {
+            setResult(RESULT_CANCELED, null);
+            finish();
+        }
 
         // try again after user interaction
         if (resultCode == RESULT_OK) {