From a0942e14e1481e2d3e4c05005de5e9a5e554fb97 Mon Sep 17 00:00:00 2001
From: Guillaume Bourge <guillaume.bourge@pa.cotte.fr>
Date: Mon, 2 Jul 2018 18:05:18 +0200
Subject: [PATCH] Fix and clean commentary

---
 .../rxandroidble2/RxBleConnection.java        |  4 +++
 .../connection/ServiceDiscoveryManager.java   | 35 ++++++++++---------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleConnection.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleConnection.java
index 87e3cdae9..64083fc4d 100644
--- a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleConnection.java
+++ b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleConnection.java
@@ -275,8 +275,12 @@ interface WriteOperationAckStrategy extends ObservableTransformer<Boolean, Boole
      *
      * Timeouts after specified amount of time.
      *
+     * The cache can be cleared to perform a new Gatt Discover and maybe find a service previously hidden
+     *
      * @param timeout multiplier of TimeUnit after which the discovery will timeout in case of no return values
      * @param timeUnit TimeUnit for the timeout
+     * @param clearCache Flag to ask the cache clearing (Warning, this functionnality can alter the good working of your app
+     *                   You should have strong knowledge of how it works)
      * @return Observable emitting result a GATT service discovery.
      * @throws BleGattCannotStartException with {@link BleGattOperationType#SERVICE_DISCOVERY} type, when it wasn't possible to start
      *                                     the discovery for internal reasons.
diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/connection/ServiceDiscoveryManager.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/connection/ServiceDiscoveryManager.java
index 6116ac6aa..f0d4f352b 100644
--- a/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/connection/ServiceDiscoveryManager.java
+++ b/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/connection/ServiceDiscoveryManager.java
@@ -47,28 +47,31 @@ class ServiceDiscoveryManager {
     }
 
     Single<RxBleDeviceServices> getDiscoverServicesSingle(final long timeout, final TimeUnit timeoutTimeUnit) {
-        if (hasCachedResults) {
-            // optimisation to decrease the number of allocations
-            return deviceServicesObservable;
-        } else {
-            return deviceServicesObservable.doOnSubscribe(
-                    new Consumer<Disposable>() {
-                        @Override
-                        public void accept(Disposable disposable) throws Exception {
-                            timeoutBehaviorSubject.onNext(new TimeoutConfiguration(timeout, timeoutTimeUnit, Schedulers.computation()));
-                        }
-                    });
-        }
+        return getDiscoverServicesSingle(timeout, timeoutTimeUnit, false);
     }
 
     Single<RxBleDeviceServices> getDiscoverServicesSingle(final long timeout, final TimeUnit timeoutTimeUnit, Boolean clearCache) {
-        if (hasCachedResults) {
+        if (clearCache) {
+            hasCachedResults = false;
+            this.deviceServicesObservable = getTimeoutConfiguration().flatMap(scheduleActualDiscoveryWithTimeout())
+                    .doOnSuccess(Functions.actionConsumer(new Action() {
+                        @Override
+                        public void run() throws Exception {
+                            hasCachedResults = true;
+                        }
+                    }))
+                    .doOnError(Functions.actionConsumer(new Action() {
+                        @Override
+                        public void run() {
+                            reset();
+                        }
+                    }))
+                    .cache();
+        }
+        if (hasCachedResults && !clearCache) {
             // optimisation to decrease the number of allocations
             return deviceServicesObservable;
         } else {
-            if (clearCache) {
-                reset();
-            }
             return deviceServicesObservable.doOnSubscribe(
                     new Consumer<Disposable>() {
                         @Override