Add additional null checks in private ScanInfo class

iDevicesInc · Aug 2, 2017 · 445829a · 445829a
1 parent 1a6a047
commit 445829a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/library/src/main/java/com/idevicesinc/sweetblue/P_ScanManager.java b/library/src/main/java/com/idevicesinc/sweetblue/P_ScanManager.java
@@ -785,6 +785,8 @@ public boolean equals(Object obj)
             if (obj instanceof ScanInfo)
             {
                 ScanInfo other = (ScanInfo) obj;
+                if ((m_device == null && other.m_device != null) || (m_device != null && other.m_device == null))
+                    return false;
                 return m_device.getAddress().equals(other.m_device.getAddress());
             }
             return false;

diff --git a/tester/src/main/java/com/idevicesinc/sweetblue/MainActivity.java b/tester/src/main/java/com/idevicesinc/sweetblue/MainActivity.java
@@ -22,6 +22,7 @@
 import java.util.Random;
 import java.util.UUID;
 import com.idevicesinc.sweetblue.tester.R;
+import com.idevicesinc.sweetblue.utils.Utils_Reflection;
 import com.idevicesinc.sweetblue.utils.Utils_String;
 import com.idevicesinc.sweetblue.utils.Uuids;