From 57a235742d887908a5b5279f1a5e900fb6b06065 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sat, 3 Aug 2019 23:40:07 +0200
Subject: [PATCH] Properly disable new ble scanning for testing

(inverted logic committed accidentially)
---
 .../gadgetbridge/activities/DiscoveryActivity.java     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
index 736a7b2f4..d29bacc70 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
@@ -49,6 +49,7 @@ import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.core.app.ActivityCompat;
 
 import org.slf4j.Logger;
@@ -77,6 +78,9 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
 
     private ScanCallback newLeScanCallback = null;
 
+    // Disabled for testing, it seems worse for a few people
+    private final boolean disableNewBLEScanning = true;
+
     private final Handler handler = new Handler();
 
     private final BroadcastReceiver bluetoothReceiver = new BroadcastReceiver() {
@@ -95,7 +99,7 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
                             // continue with LE scan, if available
                             if (isScanning == Scanning.SCANNING_BT) {
                                 checkAndRequestLocationPermission();
-                                if (!GBApplication.isRunningLollipopOrLater()) {
+                                if (GBApplication.isRunningLollipopOrLater() && !disableNewBLEScanning) {
                                     startDiscovery(Scanning.SCANNING_NEW_BTLE);
                                 } else {
                                     startDiscovery(Scanning.SCANNING_BTLE);
@@ -297,7 +301,7 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
     }
 
     @Override
-    protected void onSaveInstanceState(Bundle outState) {
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putParcelableArrayList("deviceCandidates", deviceCandidates);
     }
@@ -652,7 +656,7 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
         super.onPause();
         stopBTDiscovery();
         stopBTLEDiscovery();
-        if (!GBApplication.isRunningLollipopOrLater()) {
+        if (GBApplication.isRunningLollipopOrLater() && !disableNewBLEScanning) {
             stopNewBTLEDiscovery();
         }
     }