1 files changed, 11 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
index 7a2313e0f..af20ddc84 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
@@ -92,7 +92,9 @@ public class NfcOperationActivity extends BaseNfcActivity {
 
         // prevent annoying orientation changes while fumbling with the device
         OrientationUtils.lockOrientation(this);
-
+        // prevent close when touching outside of the dialog (happens easily when fumbling with the device)
+        setFinishOnTouchOutside(false);
+        // keep screen on
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         mInputParcel = getIntent().getParcelableExtra(EXTRA_CRYPTO_INPUT);
@@ -115,6 +117,14 @@ public class NfcOperationActivity extends BaseNfcActivity {
                 vAnimator.setDisplayedChild(0);
             }
         });
+        Button vCancel = (Button) findViewById(R.id.nfc_activity_0_cancel);
+        vCancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setResult(RESULT_CANCELED);
+                finish();
+            }
+        });
 
         Intent intent = getIntent();
         Bundle data = intent.getExtras();