cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check if NFC is available before displaying button

Browse Source
This commit is contained in:
Dominik Schürmann
2015-11-19 14:00:13 +01:00
parent 4b594e4e75
commit 62918c5718
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@@ -31,6 +31,7 @@ import android.content.Intent;
import android.database.Cursor; import android.database.Cursor;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.net.Uri; import android.net.Uri;
import android.nfc.NfcAdapter;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@@ -923,10 +924,11 @@ public class ViewKeyActivity extends BaseNfcActivity implements
mActionEncryptText.setVisibility(View.VISIBLE); mActionEncryptText.setVisibility(View.VISIBLE);
// invokeBeam is available from API 21 // invokeBeam is available from API 21
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
&& NfcAdapter.getDefaultAdapter(this) != null) {
mActionNfc.setVisibility(View.VISIBLE); mActionNfc.setVisibility(View.VISIBLE);
} else { } else {
mActionNfc.setVisibility(View.GONE); mActionNfc.setVisibility(View.INVISIBLE);
} }
showFab(); showFab();
// noinspection deprecation (no getDrawable with theme at current minApi level 15!) // noinspection deprecation (no getDrawable with theme at current minApi level 15!)
@@ -935,7 +937,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements
mActionEncryptFile.setVisibility(View.VISIBLE); mActionEncryptFile.setVisibility(View.VISIBLE);
mActionEncryptText.setVisibility(View.VISIBLE); mActionEncryptText.setVisibility(View.VISIBLE);
mQrCodeLayout.setVisibility(View.GONE); mQrCodeLayout.setVisibility(View.GONE);
mActionNfc.setVisibility(View.GONE); mActionNfc.setVisibility(View.INVISIBLE);
if (mIsVerified) { if (mIsVerified) {
mStatusText.setText(R.string.view_key_verified); mStatusText.setText(R.string.view_key_verified);