Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid NPE crash on devices without NFC. Fixes #379.

Browse Source
This commit is contained in:
Daniel Martí 2015-08-18 13:14:13 -07:00
parent fa929a4cf4
commit fd7f942595
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
F-Droid/src/org/fdroid/fdroid/NfcNotEnabledActivity.java
View File

@ -9,8 +9,7 @@ import android.provider.Settings;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBarActivity;
// aka Android 4.0 aka Ice Cream Sandwich // aka Android 4.0 aka Ice Cream Sandwich
public class NfcNotEnabledActivity extends ActionBarActivity public class NfcNotEnabledActivity extends ActionBarActivity {
{
/* /*
* ACTION_NFC_SETTINGS was added in 4.1 aka Jelly Bean MR1 as a * ACTION_NFC_SETTINGS was added in 4.1 aka Jelly Bean MR1 as a
@ -21,7 +20,11 @@ public class NfcNotEnabledActivity extends ActionBarActivity
*/ */
@TargetApi(16) @TargetApi(16)
private void doOnJellybean(Intent intent) { private void doOnJellybean(Intent intent) {
if (NfcAdapter.getDefaultAdapter(this).isEnabled()) NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this);
if (nfcAdapter == null) {
return;
}
if (nfcAdapter.isEnabled())
intent.setAction(Settings.ACTION_NFCSHARING_SETTINGS); intent.setAction(Settings.ACTION_NFCSHARING_SETTINGS);
else else
intent.setAction(Settings.ACTION_NFC_SETTINGS); intent.setAction(Settings.ACTION_NFC_SETTINGS);