Merge pull request #40 from schilit/SortOrder

Sort NEAREST above all else
google · Nov 23, 2014 · 6a184f4 · 6a184f4
2 parents 7607e84 + e92195d
commit 6a184f4
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/...oid-uribeacon/uribeacon-library/src/main/java/org/uribeacon/widget/ScanResultAdapter.java b/...oid-uribeacon/uribeacon-library/src/main/java/org/uribeacon/widget/ScanResultAdapter.java
@@ -190,6 +190,13 @@ public int compareTo(@NonNull DeviceSighting other) {
       final String otherAddress = other.scanResult.getDevice().getAddress();
       // Sort by the stabilized region of the device, unless
       // they are the same, in which case sort by distance.
+      final String nearest = mRegionResolver.getNearestAddress();
+      if (address.equals(nearest)) {
+        return -1;
+      }
+      if (otherAddress.equals(nearest)) {
+        return 1;
+      }
       int r1 = mRegionResolver.getRegion(address);
       int r2 = mRegionResolver.getRegion(otherAddress);
       if (r1 != r2) {