From 780f77dab98630e91b3e9125b27ae44dd5e47a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 18 Aug 2015 14:16:50 -0700 Subject: [PATCH] Don't show menu item to enable NFC if not available Follow-up to #379 --- F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java index db5fe756e..2261b65b7 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java @@ -234,7 +234,10 @@ public class RepoDetailsActivity extends ActionBarActivity { @TargetApi(16) private void prepareNfcMenuItems(Menu menu) { NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this); + MenuItem menuItem = menu.findItem(R.id.menu_enable_nfc); + if (nfcAdapter == null) { + menuItem.setVisible(false); return; } @@ -245,7 +248,6 @@ public class RepoDetailsActivity extends ActionBarActivity { needsEnableNfcMenuItem = !nfcAdapter.isNdefPushEnabled(); } - MenuItem menuItem = menu.findItem(R.id.menu_enable_nfc); menuItem.setVisible(needsEnableNfcMenuItem); }