diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java index 2d5a6164..0c0fcd6d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java @@ -111,7 +111,7 @@ public class ControlCenter extends Activity { startService(startIntent); - if (deviceList.isEmpty()) { + if (GB.isBluetoothEnabled() && deviceList.isEmpty()) { // start discovery when no devices are present startActivity(new Intent(this, DiscoveryActivity.class)); } else { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java index 3a6063d9..8d83a4fd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java @@ -3,6 +3,7 @@ package nodomain.freeyourgadget.gadgetbridge; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; +import android.bluetooth.BluetoothAdapter; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -73,6 +74,11 @@ public class GB { } } + static boolean isBluetoothEnabled() { + BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); + return adapter != null && adapter.isEnabled(); + } + public static String hexdump(byte[] buffer, int offset, int length) { final char[] hexArray = "0123456789ABCDEF".toCharArray(); char[] hexChars = new char[length * 2];