From 801ec4e7faf0dd584a59e003787c5db05314c342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 15 Apr 2015 18:00:45 +0200 Subject: [PATCH] sendBt might be null --- F-Droid/src/org/fdroid/fdroid/FDroidApp.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java index 3c0431dcb..f45674337 100644 --- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java +++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java @@ -288,13 +288,15 @@ public class FDroidApp extends Application { e1.printStackTrace(); found = false; } - if (!found) { - Toast.makeText(this, R.string.bluetooth_activity_not_found, - Toast.LENGTH_SHORT).show(); - activity.startActivity(Intent.createChooser(sendBt, getString(R.string.choose_bt_send))); - } else { - sendBt.setClassName(bluetoothPackageName, className); - activity.startActivity(sendBt); + if (sendBt != null) { + if (!found) { + Toast.makeText(this, R.string.bluetooth_activity_not_found, + Toast.LENGTH_SHORT).show(); + activity.startActivity(Intent.createChooser(sendBt, getString(R.string.choose_bt_send))); + } else { + sendBt.setClassName(bluetoothPackageName, className); + activity.startActivity(sendBt); + } } }