Merge pull request #33 from GauthamBanasandra/redundant-func

Move getFirstDeviceAddress to BleClientImpl
googlearchive · Dec 6, 2018 · 2521c30 · 2521c30
2 parents b23db50 + 0358a2d
commit 2521c30
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/...istlepunk_library/src/main/java/com/google/android/apps/forscience/ble/BleClientImpl.java b/...istlepunk_library/src/main/java/com/google/android/apps/forscience/ble/BleClientImpl.java
@@ -222,7 +222,11 @@ public String getFirstDeviceAddress() {
         if (bleService == null) {
             return null;
         }
-        return bleService.getBleDevices().getFirstDeviceAddress();
+        BleDevices bleDevices = bleService.getBleDevices();
+        if (bleDevices.devices.isEmpty()) {
+            return null;
+        }
+        return bleDevices.devices.keySet().iterator().next();
     }
 
     @Override

diff --git a/.../whistlepunk_library/src/main/java/com/google/android/apps/forscience/ble/BleDevices.java b/.../whistlepunk_library/src/main/java/com/google/android/apps/forscience/ble/BleDevices.java
@@ -112,14 +112,6 @@ public int getCount() {
         return devices.size();
     }
 
-    public String getFirstDeviceAddress() {
-        // TODO: is this function really necessary?
-        if (devices.isEmpty()) {
-            return null;
-        } else {
-            return devices.keySet().iterator().next();
-        }
-    }
 
     /**
      * Removes devices which haven't been seen since the last scan time and are not currently