1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 56c60506a..5ba9a95c6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -25,6 +25,7 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ActivityOptions;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ -374,6 +375,11 @@ public class ViewKeyActivity extends BaseActivity implements
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     private void invokeNfcBeam() {
+        //Check if device supports NFC
+        if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC)) {
+            Toast.makeText(this, R.string.no_nfc_support, Toast.LENGTH_SHORT).show();
+            return;
+        }
         // Check for available NFC Adapter
         mNfcAdapter = NfcAdapter.getDefaultAdapter(this);
         if (mNfcAdapter == null || !mNfcAdapter.isEnabled()) {