Try to fix BLE sensor replacement without breaking focus

BUG=32810660 Change-Id: Id7eefc92d5c74fc33cd1f2fe7f0c45c0b96c22b4
googlearchive · Nov 11, 2016 · 5958666 · 5958666
1 parent 6e80cac
commit 5958666
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.../java/com/google/android/apps/forscience/whistlepunk/devicemanager/ConnectableSensor.java b/.../java/com/google/android/apps/forscience/whistlepunk/devicemanager/ConnectableSensor.java
@@ -155,6 +155,13 @@ public boolean isSameSensor(ConnectableSensor other) {
         return mSpec.isSameSensor(other.mSpec);
     }
 
+    public boolean isUnchanged(ConnectableSensor other) {
+        if (mSpec == null) {
+            return Objects.equals(other.mConnectedSensorId, mConnectedSensorId);
+        }
+        return mSpec.isSameSensorAndSpec(other.mSpec);
+    }
+
     public boolean isBuiltIn() {
         return mSpec == null;
     }

diff --git a/...m/google/android/apps/forscience/whistlepunk/devicemanager/ConnectableSensorRegistry.java b/...m/google/android/apps/forscience/whistlepunk/devicemanager/ConnectableSensorRegistry.java
@@ -469,13 +469,9 @@ public boolean isScanning() {
     /**
      * @return true if anything is changed.
      */
-    public boolean setExperimentId(String experimentId, SensorRegistry sr) {
-        if (Objects.equals(experimentId, mExperimentId)) {
-            return false;
-        }
+    public void setExperimentId(String experimentId, SensorRegistry sr) {
         mExperimentId = experimentId;
         refresh(false, sr);
-        return true;
     }
 
     private SensorGroup getPairedGroup() {

diff --git a/...com/google/android/apps/forscience/whistlepunk/devicemanager/ExpandableDeviceAdapter.java b/...com/google/android/apps/forscience/whistlepunk/devicemanager/ExpandableDeviceAdapter.java
@@ -112,7 +112,7 @@ public boolean addAvailableSensor(String sensorKey, ConnectableSensor sensor) {
             mSensorMap.put(sensorKey, sensor);
             int parentIndex = findParentIndex(sensorKey);
             if (parentIndex >= 0) {
-                if (!previousSensor.isSameSensor(sensor)) {
+                if (!previousSensor.isUnchanged(sensor)) {
                     notifyChildItemChanged(findParentIndex(sensorKey), findChildIndex(sensorKey));
                 }
                 return true;

diff --git a/...ogle/android/apps/forscience/whistlepunk/devicemanager/ManageDevicesRecyclerFragment.java b/...ogle/android/apps/forscience/whistlepunk/devicemanager/ManageDevicesRecyclerFragment.java
@@ -168,10 +168,7 @@ public void refreshAfterLoad() {
     }
 
     private void setExperimentId(String experimentId) {
-        if (!mRegistry.setExperimentId(experimentId, mSensorRegistry)) {
-            // Nothing changed, no need to reload.
-            return;
-        }
+        mRegistry.setExperimentId(experimentId, mSensorRegistry);
         AppSingleton.getInstance(getActivity()).getDataController().getExperimentById(
                 experimentId,
                 new LoggingConsumer<Experiment>(TAG, "load experiment for name") {