From 4e26c77327a8618d072882fbf49a792091eb5243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sat, 15 Feb 2014 11:23:30 +0100 Subject: [PATCH] Don't crash on startup if NFC is not available --- src/org/fdroid/fdroid/FDroid.java | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/org/fdroid/fdroid/FDroid.java b/src/org/fdroid/fdroid/FDroid.java index 9156177b9..e280610e4 100644 --- a/src/org/fdroid/fdroid/FDroid.java +++ b/src/org/fdroid/fdroid/FDroid.java @@ -423,17 +423,19 @@ public class FDroid extends FragmentActivity { private void setupAndroidBeam() { PackageManager pm = getPackageManager(); NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this); - ApplicationInfo appInfo; - try { - appInfo = pm.getApplicationInfo("org.fdroid.fdroid", - PackageManager.GET_META_DATA); - // TODO can we send the repo here also, as a file? - Uri uris[] = { - Uri.parse("file://" + appInfo.publicSourceDir), - }; - nfcAdapter.setBeamPushUris(uris, this); - } catch (NameNotFoundException e1) { - e1.printStackTrace(); + if (nfcAdapter != null) { + ApplicationInfo appInfo; + try { + appInfo = pm.getApplicationInfo("org.fdroid.fdroid", + PackageManager.GET_META_DATA); + // TODO can we send the repo here also, as a file? + Uri uris[] = { + Uri.parse("file://" + appInfo.publicSourceDir), + }; + nfcAdapter.setBeamPushUris(uris, this); + } catch (NameNotFoundException e1) { + e1.printStackTrace(); + } } } }