From 21e3124b5fa8a7b189d69c11ad04d107edc9911d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 17 Apr 2018 14:32:10 +0200 Subject: [PATCH] prevent crash when starting swap on devices without Bluetooth/WiFi This was introduced in f90b030e76ddb03e00bc0d46977c01c1bae3936d --- .../main/java/org/fdroid/fdroid/localrepo/SwapService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java b/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java index b7e509179..e0b916096 100644 --- a/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java +++ b/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java @@ -537,11 +537,11 @@ public class SwapService extends Service { Preferences.get().unregisterLocalRepoHttpsListeners(httpsEnabledListener); LocalBroadcastManager.getInstance(this).unregisterReceiver(onWifiChange); - if (!SwapService.wasBluetoothEnabledBeforeSwap()) { + if (bluetoothAdapter != null && !wasBluetoothEnabledBeforeSwap()) { bluetoothAdapter.disable(); } - if (!SwapService.wasWifiEnabledBeforeSwap()) { + if (wifiManager != null && !wasWifiEnabledBeforeSwap()) { wifiManager.setWifiEnabled(false); }